From 36f425ba70c5d1f4bf5046e0ff10cd6e203d9460 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 14:22:08 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/toolset build 20191016.20 (#5253) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19516.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6639e301c..eb475da6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,17 +69,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - d8faf9fc85664195c2cecf6c4fbe8d919f99b1f0 + d297b9de9bd2a851dde6c9cdeed8948e193c4916 https://github.com/dotnet/sdk dc6f52268517e279bc001aec4520585d9b040e41 - + https://github.com/dotnet/cli - 2bb5a58198c6d96aae157ea3a119867b57cd839d + ece3047c307eef54bca383662cda315d6d4ee23a diff --git a/eng/Versions.props b/eng/Versions.props index 3284d8621..4db57264b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19516.19 + 3.0.101-servicing.19516.20 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19503.4 + 3.0.101-servicing.19516.6 0.2.0 From ab03d3282c3728cb5f45a70520b3618b4116d05c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 23:19:29 +0000 Subject: [PATCH 2/6] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5265) * Update dependencies from https://github.com/dotnet/toolset build 20191017.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19517.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19517.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191017.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19517.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19517.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191017.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19517.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19517.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191017.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19517.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19517.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191017.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19517.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19517.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb475da6f..aad2738a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,17 +69,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - d297b9de9bd2a851dde6c9cdeed8948e193c4916 + 7191767cf8f3a3f0b2133612c6af8af658560d60 https://github.com/dotnet/sdk dc6f52268517e279bc001aec4520585d9b040e41 - + https://github.com/dotnet/cli - ece3047c307eef54bca383662cda315d6d4ee23a + 973a51de880fe7a0fa170c551e60a1042bee2a3b diff --git a/eng/Versions.props b/eng/Versions.props index 4db57264b..2ac65760c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19516.20 + 3.0.101-servicing.19517.15 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19516.6 + 3.0.101-servicing.19517.5 0.2.0 From c5f5f953d51918251143dd5c5162aeed9d30e9c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2019 19:05:57 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/toolset build 20191021.3 (#5293) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19521.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aad2738a7..ebe7e84e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 7191767cf8f3a3f0b2133612c6af8af658560d60 + ba532c8cca4a59b01e0829bb2650fa69fb1cc9a3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2ac65760c..6605d8210 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19517.15 + 3.0.101-servicing.19521.3 From 9525784940504a66bb0dd0a09207c5b6605b578c Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 23 Oct 2019 11:08:02 -0700 Subject: [PATCH 4/6] Pass timeout along (#5302) --- eng/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/build.yml b/eng/build.yml index 82e02fabc..944d1e0ce 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -21,6 +21,7 @@ phases: - template: /eng/common/templates/job/job.yml parameters: name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildArtifacts: true From a655115e465ab57278ee3bd73f6681a3084304c6 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 25 Oct 2019 13:54:21 -0700 Subject: [PATCH 5/6] Download shared runtime archive from correct blob location (#5308) --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 962bb973a..1221f47f2 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -102,7 +102,7 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimePackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(CombinedFrameworkHostCompressedFileName) $(CoreSetupBlobAccessTokenParam) From 7dd2e72f849a731e717a7aa10330814efce78655 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 25 Oct 2019 14:12:50 -0700 Subject: [PATCH 6/6] Remove old style restore sources (#5338) --- eng/Versions.props | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6605d8210..4b840bf48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,19 +104,4 @@ 2.0.1-servicing-26011-01 - - - $(RestoreSources); - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://dotnet.myget.org/F/msbuild/api/v3/index.json; - https://dotnet.myget.org/F/nuget-build/api/v3/index.json; - https://dotnet.myget.org/F/templating/api/v3/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json; - -