Skip to content

Commit 4973ede

Browse files
dseefeldcrummel
dseefeld
authored and
crummel
committed
Re-update to 3.1.11/3.1.111 using fixed tool
1 parent aa8fb1e commit 4973ede

8 files changed

+46
-92
lines changed

‎NuGet.config

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<add key="darc-int-dotnet-templating-7ab67ec7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7ab67ec7/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-extensions-bdc3bee" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-bdc3beed/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-core-setup-1721e39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-2/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-core-setup-1721e39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-1/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-core-setup-1721e39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-aspnetcore-tooling-e2442f2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-e2442f29/nuget/v3/index.json" />
12-
<add key="darc-pub-dotnet-aspnetcore-e318707" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e3187077/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-corefx-59d2f36e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-59d2f36e/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-core-setup-f5eceb81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f5eceb81/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-tooling-cd25a65e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-cd25a65e/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-extensions-77d62c57" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-77d62c57/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-9699b939" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-9699b939/nuget/v3/index.json" />
1312
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1413
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1514
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />

‎build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ if [ "${internalPackageFeedPat:-}" ]; then
119119
# The internal transport isn't added by Darc, though, so it will still need special-casing.
120120
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
121121
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7ab67ec7/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
122+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-59d2f36e/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
123+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f5eceb81/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
124+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-cd25a65e/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-77d62c57/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-9699b939/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
122127
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
123128
]}'
124129
fi

‎eng/Version.Details.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@
3737
<Uri>https://github.com/dotnet/standard</Uri>
3838
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20519.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
41-
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>1b5b5f0bf030bf7250c3258c140fa9e4214325c8</Sha>
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20566.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
41+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
42+
<Sha>59d2f36ec02c494eec50940c7993257a807f9531</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
47-
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>1721e3943939f9af7d5effa702bb7e9b99e254f1</Sha>
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
47+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
48+
<Sha>f5eceb810586ea6138aadcef9e2bba115015ab99</Sha>
4949
<RepoName>core-setup</RepoName>
5050
<RepoName>core-setup-portable</RepoName>
5151
</Dependency>
52-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
53-
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>e2442f29530222358b73882e38d18c4f850900aa</Sha>
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
53+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>
54+
<Sha>cd25a65e47d2740ebe460fb4c465a66298e42145</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
5757
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -72,9 +72,9 @@
7272
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
7373
<RepoName>nuget-client</RepoName>
7474
</Dependency>
75-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.10" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
76-
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>bdc3beedabad610723b62f484f0ff7be6c97d87e</Sha>
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
76+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
77+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
8080
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.111-servicing.20561.13" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -96,37 +96,37 @@
9696
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9797
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>e3187077455f953200e3c930430808a30f48b82e</Sha>
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
101+
<Sha>9699b939f94b7524a178821d78addefa5af5d750</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.110-servicing.20520.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105-
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>6178adefc009ccdaffa99cbdb57fe3e8b6980825</Sha>
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.111-servicing.20570.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-cli</Uri>
106+
<Sha>ae61eac41692ef81b6cce06d56d758a4e348191e</Sha>
107107
<RepoName>cli</RepoName>
108108
</Dependency>
109109
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/dotnet/fsharp</Uri>
111111
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.110-servicing.20520.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114-
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>1fbd5c7407eec344444a601fb4cf69a79a2d2164</Sha>
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.11-servicing.20570.12" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-websdk</Uri>
115+
<Sha>8c7152d287be3a2e594555d75c750cf773a4dbe2</Sha>
116116
<RepoName>websdk</RepoName>
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
119119
<Uri>https://github.com/microsoft/vstest</Uri>
120120
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.110-servicing.20521.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123-
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>1ea353920cd54590f12c6e4592da05bc14a09baa</Sha>
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.111-servicing.20570.21" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>
124+
<Sha>1b928f45826015068a84e30a61868433ea74697c</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20521.10">
128-
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>f02c158773cf1b5fd547570d55ad5a436b58f81d</Sha>
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="3.1.111-servicing-015181">
128+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-installer</Uri>
129+
<Sha>a9538e031d92052e74583261eb736b7ffd79f93c</Sha>
130130
<RepoName>core-sdk</RepoName>
131131
</Dependency>
132132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ index 6880ef82ed..854ab2f3a5 100644
3535
},
3636
"msbuild-sdks": {
3737
- "Yarn.MSBuild": "1.15.2",
38-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20509.7",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20509.7"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20569.8",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20569.8"
4040
}
4141
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
4242
index 36eec6b93a..19c5906526 100644

‎patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index 854ab2f3a5..bc379b038e 100644
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.109",
27+
"dotnet": "3.1.110",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"

‎patches/core-sdk/0007-Don-t-set-SourceLinkVersion-in-core-sdk.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎smoke-testNuGet.Config

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7-
<add key="darc-pub-dotnet-templating-608ee2d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-608ee2d9/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-extensions-bdc3bee" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-bdc3beed/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-core-setup-1721e39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-2/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-core-setup-1721e39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-1/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-core-setup-1721e39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394/nuget/v3/index.json" />
12-
<add key="darc-pub-dotnet-aspnetcore-tooling-e2442f2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-e2442f29/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-aspnetcore-e318707" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e3187077/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-templating-7ab67ec7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7ab67ec7/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-corefx-59d2f36e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-59d2f36e/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-core-setup-f5eceb81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f5eceb81/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-aspnetcore-tooling-cd25a65e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-cd25a65e/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-extensions-77d62c57" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-77d62c57/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-aspnetcore-9699b939" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-9699b939/nuget/v3/index.json" />
1413
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1514
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
1615
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />

0 commit comments

Comments
 (0)