diff --git a/.vsts.pipelines/builds/matrix.yml b/.vsts.pipelines/builds/matrix.yml
index 2a7b2c52a5..fec9f74e2b 100644
--- a/.vsts.pipelines/builds/matrix.yml
+++ b/.vsts.pipelines/builds/matrix.yml
@@ -62,7 +62,7 @@ jobs:
- template: ../jobs/ci-linux.yml
parameters:
job: ubuntu1804
- imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-f90bc20-20180320154721
+ imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20200918145614-047508b
- template: ../jobs/ci-local.yml
parameters:
diff --git a/.vsts.pipelines/jobs/ci-linux_bootstrap.yml b/.vsts.pipelines/jobs/ci-linux_bootstrap.yml
index 6d9dc818db..e2b59f0561 100644
--- a/.vsts.pipelines/jobs/ci-linux_bootstrap.yml
+++ b/.vsts.pipelines/jobs/ci-linux_bootstrap.yml
@@ -50,7 +50,7 @@ jobs:
set -ex
df -h
$(docker.run) $(docker.bst.map) $(docker.bst.work) $(imageName) bash -c '
- git clone --single-branch --branch pre-arcade --depth 1 https://github.com/dotnet/source-build-reference-packages'
+ git clone --single-branch --branch pre-arcade-release/3.1 --depth 1 https://github.com/dotnet/source-build-reference-packages'
du -h $(rootDirectory) | sort -h | tail -n 50
displayName: clone source-build-reference-packages
condition: always()
diff --git a/NuGet.config b/NuGet.config
index 6b5910305b..d08808780d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,10 +3,16 @@
+
+
+
+
+
+
diff --git a/eng/SourceBuild.Tarball.targets b/eng/SourceBuild.Tarball.targets
index 337695f179..a3211831e7 100644
--- a/eng/SourceBuild.Tarball.targets
+++ b/eng/SourceBuild.Tarball.targets
@@ -25,6 +25,8 @@
Project="SourceBuild.Tarball.DestructiveCleanup.targets"
Condition="'$(DestructiveIntermediateClean)' == 'true'"/>
+
+
$([MSBuild]::NormalizeDirectory('$(TarballRoot)'))
@@ -151,23 +153,39 @@
Include="$(ProjectDir)support/tarball/build.sh"
RelativeDestination="build.sh" />
-
-
-
+
+
+
+ $(ArtifactsDir)support\smoke-testNuGet.Config
+
+
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f421a7707f..6a7280b214 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -27,9 +27,9 @@
1127689f262d52ea8ff68ef03d706fa62b3b40a1
linker
-
+
https://github.com/dotnet/coreclr
- f897710bc4efe6a046068fde0acf641667a8fff5
+ 8775efa17eaf06dc8b6ea9dd3917871fe2d7ff8e
coreclr
coreclr-portable
@@ -37,26 +37,26 @@
https://github.com/dotnet/standard
a5b5f2e1e369972c8ff1e2183979fab6099f52ef
-
+
https://github.com/dotnet/corefx
- d6302a72f8eafa326d7572a02acf8f3021ebb9e8
+ 3009a1fc20d9cb47d117399040d31c23f7b23e02
corefx
corefx-portable
-
+
https://github.com/dotnet/core-setup
- 9c1330deddc14e8c564e30402d6a644c43110778
+ 774fc3d6a9659077864171d095f46b1ea19bb51d
core-setup
core-setup-portable
-
+
https://github.com/dotnet/aspnetcore-tooling
- 02423c0c6c445b12abea9fee03ebdb2e18b4a2dd
+ f677187340747f56193e7731df449579b4ba5af6
aspnetcore-tooling
-
+
https://github.com/dotnet/templating
- 10dad0fa67c3cd3db542c29d591de026ed45147b
+ 7ea6e5075b24adc5a0d8964125699d141ac67efa
templating
@@ -72,14 +72,14 @@
6f8eb3a2e1db6b458451b9cfd2a4f5557769b041
nuget-client
-
+
https://github.com/dotnet/extensions
- 1774c15ac24c65513fa9fc1f4fbb69be9a2a4e25
+ d8a50ea1cc9892cda13c5237dec402ca10ddeaa1
aspnet-extensions
-
+
https://github.com/dotnet/sdk
- 82e2b68c9ef7f28307114c4ab4d43c11e6f7cd52
+ afdde814dc8dedb325e63b39cf72249b43918a23
sdk
@@ -96,37 +96,37 @@
https://github.com/dotnet/xliff-tasks
173ee3bd61c9549557eefa3cfb718bdef157cb87
-
+
https://github.com/dotnet/aspnetcore
- c75b3f7a2fb9fe21fd96c93c070fdfa88a2fbe97
+ d12868dd7c10ff0433c16b06d3b59d03c40d987a
aspnetcore
-
+
https://github.com/dotnet/cli
- 781686b7534a8203e3944c2b111df5a279d9c43e
+ 8425963d35b2ebb92fdb4312e20ce3f91a886073
cli
https://github.com/dotnet/fsharp
dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e
-
+
https://github.com/dotnet/websdk
- 3478a1379fe3765b28eb3f7cb889fb45233fb09c
+ d4160cb5bf36df284208df3f64c7a461826eb90d
websdk
https://github.com/microsoft/vstest
55e7e45431c9c05656c999b902686e7402664573
-
+
https://github.com/dotnet/toolset
- d04a69c978e9099d743ce68c667fafe9a1a7d59e
+ 6bde7fd6666a4e97f5409b536ff5290bcb3bcd3e
toolset
-
+
https://github.com/dotnet/installer
- c423b556b530ff8a168386d63821acb6dfc6ee5d
+ 32ced2d411573dd57d75c222e5d89ecd0e03c11d
core-sdk
diff --git a/eng/Versions.props b/eng/Versions.props
index f9bd6bbda2..313c71a8c1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,6 +8,6 @@
1.0.0-beta.20374.1
- 0.1.0-3.1.106
+ 0.1.0-3.1.108
diff --git a/global.json b/global.json
index b2a5c98255..46ef012170 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "3.1.106"
+ "dotnet": "3.1.108"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config
index afbad0b55e..2240197196 100644
--- a/smoke-testNuGet.Config
+++ b/smoke-testNuGet.Config
@@ -4,6 +4,11 @@
+
+
+
+
+
diff --git a/support/tarball/smoke-testNuGet.Config b/support/tarball/smoke-testNuGet.Config
deleted file mode 100644
index afbad0b55e..0000000000
--- a/support/tarball/smoke-testNuGet.Config
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
index db3d90aba2..a964d39fea 100644
--- a/tools-local/prebuilt-baseline-online.xml
+++ b/tools-local/prebuilt-baseline-online.xml
@@ -6,7 +6,9 @@
+
+
@@ -52,8 +54,6 @@
-
-
@@ -77,7 +77,6 @@
-