diff --git a/build.sh b/build.sh
index aeeb528d24..15e8f5f19b 100755
--- a/build.sh
+++ b/build.sh
@@ -118,11 +118,11 @@ if [ "${internalPackageFeedPat:-}" ]; then
# TODO: Read these from nuget.config
# The internal transport isn't added by Darc, though, so it will still need special-casing.
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-8ca3954c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-b4f2d743/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-dc339bd0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-194782ed/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7116c61c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-7e8bbb70/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-198cc5ec/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-4c6b4aa2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-60938620/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-241b4771-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/3-1-13-2-18-21/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2e92107731..b6348ca832 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -27,9 +27,9 @@
1127689f262d52ea8ff68ef03d706fa62b3b40a1
linker
-
+
https://github.com/dotnet/coreclr
- 803ce08ee96925f9d08021c9c6b96af8f27d16c4
+ b820e148c5ded6a37cb3ddb38b88b54210189562
coreclr
coreclr-portable
@@ -37,26 +37,26 @@
https://github.com/dotnet/standard
a5b5f2e1e369972c8ff1e2183979fab6099f52ef
-
+
https://github.com/dotnet/corefx
- 585ae475d8aebdecf310d7509585003721509c5a
+ 658544bf73653f734bca9675602fa57440f8b718
corefx
corefx-portable
-
+
https://github.com/dotnet/core-setup
- dc339bd0fb2ec082e3afdc0a5ade2066a86d1681
+ 4c6b4aa257241c4d419b8c271e37afac4445b1c0
core-setup
core-setup-portable
-
+
https://github.com/dotnet/aspnetcore-tooling
- b4f2d7437db4b5f36375cfcf1de316e3e42fcee6
+ 198cc5ec1c2fa512a34273fdfcc659e54c539002
aspnetcore-tooling
-
+
https://github.com/dotnet/templating
- 7116c61c686c40fa0cb33f6f96a3631f8764846e
+ 241b4771f5caa832464e16ee6739c291d12b0ff5
templating
@@ -72,14 +72,14 @@
6f8eb3a2e1db6b458451b9cfd2a4f5557769b041
nuget-client
-
+
https://github.com/dotnet/extensions
- 194782ed2ccc8f5103e741c8421a60c3618c8fed
+ 60938620996db86debee5cf1652e70a6ec5cb3e7
aspnet-extensions
-
+
https://github.com/dotnet/sdk
- e78e47c7ee386dfe0c1c30d8db2bb15d517cb825
+ ef142b8d894e6f4b4f5f2d086e1802ec56351dd6
sdk
@@ -96,37 +96,37 @@
https://github.com/dotnet/xliff-tasks
173ee3bd61c9549557eefa3cfb718bdef157cb87
-
+
https://github.com/dotnet/aspnetcore
- 8ca3954ca335343ce6dd1d14d8d1c6c3369710b7
+ 7e8bbb70b266b2fdaf0b11ec47fb3077761fb6bf
aspnetcore
-
+
https://github.com/dotnet/cli
- 6a07d0e5d0f8a660113e5d6007d5b107ef8a6b8b
+ 49e1881e820b9958b6292276afc5afb8a7b2b9d8
cli
https://github.com/dotnet/fsharp
dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e
-
+
https://github.com/dotnet/websdk
- 165b36ca8a73efee5660465ec1281d24fddf67e5
+ 7f8358e605a2a61afbba8b5e61be6a9f6c474955
websdk
https://github.com/microsoft/vstest
55e7e45431c9c05656c999b902686e7402664573
-
+
https://github.com/dotnet/toolset
- af8eb8e1d2dc75ee3152b57aea2d49ec6a7d3f48
+ 7e6521f300e2a942d94c3be4eefbde921d3bbe74
toolset
-
+
https://github.com/dotnet/installer
- 612a6634c59d6c946d232929055665bc64b18f49
+ 975b5bfc36d279a27ee35637f6503b5b9ddb7b1c
core-sdk
diff --git a/eng/Versions.props b/eng/Versions.props
index 43c74ae7f7..814b9a1bf2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,6 +8,6 @@
1.0.0-beta.20374.1
- 0.1.0-3.1.114
+ 0.1.0-3.1.115
diff --git a/global.json b/global.json
index 45d752bc56..63fac88232 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "3.1.114"
+ "dotnet": "3.1.115"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
diff --git a/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch b/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch
index 9d78d4d03b..b02d13c31a 100644
--- a/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch
+++ b/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch
@@ -24,7 +24,7 @@ index de628eca3c..3fb6244e52 100644
+++ b/global.json
@@ -5,10 +5,7 @@
"tools": {
- "dotnet": "3.1.114",
+ "dotnet": "3.1.115",
"runtimes": {
- "dotnet/x64": [
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
index c5ddaadf6e..cc727dbf67 100644
--- a/tools-local/prebuilt-baseline-offline.xml
+++ b/tools-local/prebuilt-baseline-offline.xml
@@ -1,44 +1,3 @@
centos.7-x64
-
- src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/
- src/arcade.15f00efd583eab4372b2e9ca25bd80ace5b119ad/
- src/dotnet-extensions.be18161fbed286d6fb7a7b1c7999ce70a50cf3eb/
- src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/
- src/dotnet-aspnetcore-tooling.d63ec4a166a5c4f40fcbb823873cfa68cfd39eae/
- src/dotnet-aspnetcore.62c098bc170f50feca15916e81cb7f321ffc52ff/
- src/dotnet-cli.01244375eb89e6e3ea48123f7b6ec8193403a7ba/
- src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/
- src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/
- src/dotnet-installer.0f94483edc7cae71ffc34a2c8e8f0a54534e331f/
- src/dotnet-core-setup.3acd9b0cd16596bad450c82be08780875a73c05c/
- src/dotnet-core-setup.3acd9b0cd16596bad450c82be08780875a73c05c/
- src/coreclr.20ee1c47c2bcec0101e3cf04c98549aeffe85989/
- src/coreclr.20ee1c47c2bcec0101e3cf04c98549aeffe85989/
- src/dotnet-corefx.73aa947bfae18d576fc2fe69fb9c3f7839decd93/
- src/dotnet-corefx.73aa947bfae18d576fc2fe69fb9c3f7839decd93/
- src/fsharp.dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e/
- src/known-good-tests./
- src/known-good./
- src/linker.1127689f262d52ea8ff68ef03d706fa62b3b40a1/
- src/msbuild.e901037fe1815eae17424f860412d0b967d09461/
- src/netcorecli-fsc/
- src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/
- src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/
- src/NuGet.Client.6f8eb3a2e1db6b458451b9cfd2a4f5557769b041/
- src/package-source-build/
- src/roslyn.d8180a5ecafb92adcfbfe8cf9199eb23be1a1ccf/
- src/dotnet-sdk.ff65e086ba67984e42a64123bcc6c310d0183fd4/
- src/sourcelink.f175b06862f889474b689a57527e489101c774cc/
- src/standard.a5b5f2e1e369972c8ff1e2183979fab6099f52ef/
- src/templating.3a2d6426513c7add0c1c140165d528c33e62bc21/
- src/dotnet-toolset.a7844b9e4a0db833265766e2af14dc7391371038/
- src/vstest.55e7e45431c9c05656c999b902686e7402664573/
- src/dotnet-websdk.9d9bfc40e20005ff3504d86a9b86bdcc447d94b2/
- src/xliff-tasks.173ee3bd61c9549557eefa3cfb718bdef157cb87/
- Tools/
- tools-local/tasks/
- artifacts/obj/
-
-
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
index ddbbad87ca..37681c3ff5 100644
--- a/tools-local/prebuilt-baseline-online.xml
+++ b/tools-local/prebuilt-baseline-online.xml
@@ -1,5 +1,5 @@
- fedora.31-x64
+ centos.7-x64
@@ -363,4 +363,4 @@
-
\ No newline at end of file
+