From 3628abc4c8bb23dfc51bcb76f812f460ecb82b7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 20:26:26 +0000 Subject: [PATCH 01/25] [release/5.0] Update dependencies from dotnet/arcade (#36838) [release/5.0] Update dependencies from dotnet/arcade - fix tests for 5.0.401 --- NuGet.config | 4 ---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 8 ++++---- .../Shared/TemplatePackageInstaller.cs | 7 +++++-- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25589bd37154..25788976f9cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -22,10 +20,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba9bf3ba98a4..7ef1434079a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -313,17 +313,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://github.com/dotnet/arcade - 2e26f9ebee3ac27803aa5f2df50192a46393d108 + f2ebec887288367b18d3299cce38ae3365215555 - + https://github.com/dotnet/arcade - 2e26f9ebee3ac27803aa5f2df50192a46393d108 + f2ebec887288367b18d3299cce38ae3365215555 - + https://github.com/dotnet/arcade - 2e26f9ebee3ac27803aa5f2df50192a46393d108 + f2ebec887288367b18d3299cce38ae3365215555 diff --git a/eng/Versions.props b/eng/Versions.props index 39055d72ec6d..cfc7e8651856 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,7 +136,7 @@ 5.0.10 5.0.10 - 5.0.0-beta.21427.7 + 5.0.0-beta.21471.4 From d721ecddb7f3540f7278790712205484560842d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:54:49 -0700 Subject: [PATCH 03/25] [release/5.0] (deps): Bump src/submodules/googletest (#37175) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `955c7f8` to `3b49be0`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/955c7f837efad184ec63e771c42542d37545eaef...3b49be074d5c1340eeb447e6a8e78427051e675a) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index 955c7f837efa..3b49be074d5c 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 955c7f837efad184ec63e771c42542d37545eaef +Subproject commit 3b49be074d5c1340eeb447e6a8e78427051e675a From d8c59b1c2783bb36fcccbe810613f62675264218 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:54:59 -0700 Subject: [PATCH 04/25] [release/5.0] Clear layout directories before copies (#37165) - backport of #36719 Clear layout directories before copies (#36719) - `` task (well, most tasks though not `tar` commands) will create directories - avoid leftover files from a previous build - avoid confusing SDK with an empty targeting pack directory - prevented ASP.NET targeting pack download when not building it (see #36718) --- .../src/Microsoft.AspNetCore.App.Ref.csproj | 6 ++---- .../Microsoft.AspNetCore.App.Runtime.csproj | 18 +++++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj index ec0a772d018b..4eb94f57837b 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj @@ -189,21 +189,19 @@ This package is an internal implementation of the .NET Core SDK and is not meant DependsOnTargets="_ResolveTargetingPackContent" Inputs="@(RefPackContent)" Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(FileName)%(Extension)')"> + - - - - + diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index cfbe759aff09..adc03bf83576 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -328,14 +328,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(IntermediateOutputPath)platformAssemblies\ - - - - - - - - @@ -359,6 +351,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Condition="'$(CrossgenOutput)' == 'true'" DependsOnTargets="_ExpandRuntimePackageRoot"> + @@ -386,6 +379,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(CrossgenPlatformAssemblyPaths)\ + + + - + @@ -475,7 +471,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant DependsOnTargets="_ResolveSharedFrameworkContent" Inputs="@(SharedFxContent)" Outputs="@(SharedFxContent->'$(RedistLayoutTargetDir)%(FileName)%(Extension)')"> - + @@ -488,7 +484,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Name="_InstallFrameworkIntoLocalDotNet" Inputs="@(SharedFxContent)" Outputs="@(SharedFxContent->'$(LocalInstallationOutputPath)%(FileName)%(Extension)')"> - + From bd6c9ff2825a68ffab6d58539b889f9f39e24579 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:55:10 -0700 Subject: [PATCH 05/25] [release/5.0] Don't clear NuGet caches at all (#37163) - backport of #36898 Don't clear NuGet caches at all (#36898) - `$use_global_nuget_cache` and `$useGlobalNuGetCache` have default values in our pipelines - therefore, cache is always within `$(System.DefaultWorkingDirectory)` and should not exist at job start --- .azure/pipelines/jobs/default-build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 9996b79ef7ef..fa8d8f0f44db 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -158,14 +158,6 @@ jobs: displayName: Install Node 10.x inputs: versionSpec: 10.x - - ${{ if eq(parameters.agentOs, 'Windows') }}: - - task: NuGetToolInstaller@1 - - task: NuGetCommand@2 - displayName: 'Clear NuGet caches' - condition: succeeded() - inputs: - command: custom - arguments: 'locals all -clear' - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - powershell: ./eng/scripts/InstallJdk.ps1 displayName: Install JDK 11 From 253540764ace14bbb00e6baa456b1e45ce570004 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:55:21 -0700 Subject: [PATCH 06/25] [release/5.0] Use new Hosted build pools (#37162) - `cherry-pick` of f4cc3c003222658b92753af55fbd66dbfa59251b Co-authored-by: Ulises Hernandez --- .azure/pipelines/jobs/default-build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index fa8d8f0f44db..cf73dfd92bfa 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -98,24 +98,24 @@ jobs: vmImage: ubuntu-18.04 ${{ if eq(parameters.useHostedUbuntu, false) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1804.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1804.Amd64 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool + name: NetCore1ESPool-Svc-Public ${{ if ne(parameters.isTestingJob, true) }}: # Visual Studio Build Tools - queue: BuildPool.Server.Amd64.VS2019.BT.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2019.BT.Open ${{ if eq(parameters.isTestingJob, true) }}: # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - queue: BuildPool.Server.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool + name: NetCore1ESPool-Svc-Internal # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - queue: BuildPool.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} variables: From 5607e6411b29ef6edaf557ca280c4d038d785abd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:55:39 -0700 Subject: [PATCH 07/25] [release/5.0] Create .rpm's for Linux Mariner (#36894) * Create .rpm's for Linux Mariner * Update Directory.Build.targets Co-authored-by: Will Godbe --- src/Installers/Rpm/Directory.Build.targets | 9 +++++++++ src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj | 2 ++ .../Rpm/TargetingPack/Rpm.TargetingPack.rpmproj | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index b1779c0a1ed0..087bca758430 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -74,5 +74,14 @@ + + + + diff --git a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj index aec18334fe00..859e44cd86be 100644 --- a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj +++ b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj @@ -13,6 +13,8 @@ $(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.rpm + $(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.1-x64.rpm $(InstallersOutputPath)$(TargetFileName) + $(InstallersOutputPath)$(CblMarinerTargetFileName) diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index 38f5fbf78bb6..ca5f46bb68b4 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -28,8 +28,10 @@ $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).rpm + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-cm.1.rpm $(InstallersOutputPath)$(TargetFileName) - + $(InstallersOutputPath)$(CblMarinerTargetFileName) + $(TargetingPackVersionPrefix) From e8d2d8140c2a7a6cb8034d0d8bf744617fa0ee1f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:55:49 -0700 Subject: [PATCH 08/25] Make `deactivate` clean x86 root (#36758) Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> --- activate.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/activate.ps1 b/activate.ps1 index bc6f326e8b78..b1e0e8f5a199 100644 --- a/activate.ps1 +++ b/activate.ps1 @@ -25,6 +25,7 @@ function deactivate ([switch]$init) { } Remove-Item env:DOTNET_ROOT -ea ignore + Remove-Item 'env:DOTNET_ROOT(x86)' -ea Ignore Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ea ignore if (-not $init) { # Remove the deactivate function From 0f6f0f047b350ef1294374ca92d79087c0dfa147 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 5 Oct 2021 12:56:07 -0700 Subject: [PATCH 09/25] Revert "Disable OSX10.14 Helix jobs for now (#36504)" (#36564) This reverts commit b6a4909420d517a060b2d10a4522620c58f42f95. --- eng/targets/Helix.Common.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 766045d70f2e..9a93090fa4f0 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -22,8 +22,7 @@ - - + From 1c577f7f3ac782aeb2bfa79dbbaff06a45e883b3 Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 5 Oct 2021 12:56:57 -0700 Subject: [PATCH 10/25] Update build.gradle (#36478) * Update build.gradle Backport of https://github.com/dotnet/aspnetcore/pull/36330 * Update build.gradle --- src/SignalR/clients/java/signalr/core/build.gradle | 8 ++++---- src/SignalR/clients/java/signalr/messagepack/build.gradle | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index 41b7668da1e0..12a614a6947a 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -40,9 +40,9 @@ task generatePOM { } } scm { - connection 'scm:git:git://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' - url 'http://github.com/dotnet/aspnetcore/tree/master' + connection 'scm:git:https://github.com/dotnet/aspnetcore.git' + developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' + url 'https://github.com/dotnet/aspnetcore/tree/master' } developers { developer { @@ -78,4 +78,4 @@ class Version { } } -compileJava.dependsOn generateVersionClass \ No newline at end of file +compileJava.dependsOn generateVersionClass diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 365d56d383ce..221bae0c47fe 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -39,9 +39,9 @@ task generatePOM { } } scm { - connection 'scm:git:git://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' - url 'http://github.com/dotnet/aspnetcore/tree/master' + connection 'scm:git:https://github.com/dotnet/aspnetcore.git' + developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' + url 'https://github.com/dotnet/aspnetcore/tree/master' } developers { developer { @@ -53,4 +53,4 @@ task generatePOM { }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom") } -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) \ No newline at end of file +task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) From 8231dc7467510d793961030fca6fd0c1715aaa9c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Oct 2021 20:18:57 +0000 Subject: [PATCH 11/25] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 794a418089e1..037aa1aea26d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,11 @@ - + + + @@ -23,9 +25,11 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0aadfe16bf9..68d8a7693f16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f + 5de05f43faa3486f1f108788851dfb38edc3d849 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9ce6c9454700..4b9b149ce075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,14 +127,14 @@ 5.0.4 - 5.0.11 - 5.0.11 - 5.0.11 - 5.0.11 - 5.0.11 - 5.0.11 - 5.0.11 - 5.0.11 + 5.0.12 + 5.0.12 + 5.0.12 + 5.0.12 + 5.0.12 + 5.0.12 + 5.0.12 + 5.0.12 5.0.0-beta.21427.7 From adb58356bedfbbab068a9af1a219df43d084fbc1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 6 Oct 2021 10:51:35 +0000 Subject: [PATCH 12/25] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 037aa1aea26d..ed48dbd6a3a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68d8a7693f16..e3fc930b3f85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5de05f43faa3486f1f108788851dfb38edc3d849 + 5e92afde91de2f42acffb0b5e3ece281e54655a5 https://github.com/dotnet/runtime From c269a987be68fed9d329d1b663f62361bc63a205 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 6 Oct 2021 11:59:57 +0000 Subject: [PATCH 13/25] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed48dbd6a3a3..23a2c3d393a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3fc930b3f85..c9807468fb2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5e92afde91de2f42acffb0b5e3ece281e54655a5 + 8e7566d2a14268b0ed2e9f45e71534989b19a1db https://github.com/dotnet/runtime From a23e146290e0abd6a277e927894cf78eac6b04e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 6 Oct 2021 21:08:14 +0000 Subject: [PATCH 14/25] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 8 ++------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23a2c3d393a0..32104694f613 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -24,9 +22,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9807468fb2f..aa0886c77e35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -203,7 +203,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f431858f8b1f1510723ace6343786c9194dbd7fc + ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -294,24 +294,24 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f431858f8b1f1510723ace6343786c9194dbd7fc + ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f431858f8b1f1510723ace6343786c9194dbd7fc + ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f431858f8b1f1510723ace6343786c9194dbd7fc + ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f431858f8b1f1510723ace6343786c9194dbd7fc + ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4b9b149ce075..d645935d118f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.11-servicing.21473.8 + 5.0.12-servicing.21506.6 5.0.0 - 5.0.11 - 5.0.11-servicing.21473.8 + 5.0.12 + 5.0.12-servicing.21506.6 5.0.0 5.0.0 5.0.0 From 82da6c2217689906a5932cc765dc15bcffacf8c0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 7 Oct 2021 21:35:32 +0000 Subject: [PATCH 15/25] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32104694f613..f945786f8b8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa0886c77e35..c586a56367d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -203,7 +203,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 + e234755a116df89304d6edb35e943e9b231ccc46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 + e234755a116df89304d6edb35e943e9b231ccc46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 + e234755a116df89304d6edb35e943e9b231ccc46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 + e234755a116df89304d6edb35e943e9b231ccc46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ccb735a7c25fb4ebac616d6c8bdcf9df3b529f52 + e234755a116df89304d6edb35e943e9b231ccc46 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index d645935d118f..2d25619571ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.12-servicing.21506.6 + 5.0.12-servicing.21507.8 5.0.0 5.0.12 - 5.0.12-servicing.21506.6 + 5.0.12-servicing.21507.8 5.0.0 5.0.0 5.0.0 From 6463cfed436eb849270de884f726202121579daf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:24:06 +0000 Subject: [PATCH 16/25] Update dependencies from https://github.com/dotnet/arcade build 20211009.1 (#37452) [release/5.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ef1434079a4..4aac83e4f759 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -313,17 +313,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://github.com/dotnet/arcade - f2ebec887288367b18d3299cce38ae3365215555 + 1f8b5698fa4c1307d9db78cd45345e0160a746fb - + https://github.com/dotnet/arcade - f2ebec887288367b18d3299cce38ae3365215555 + 1f8b5698fa4c1307d9db78cd45345e0160a746fb - + https://github.com/dotnet/arcade - f2ebec887288367b18d3299cce38ae3365215555 + 1f8b5698fa4c1307d9db78cd45345e0160a746fb diff --git a/eng/Versions.props b/eng/Versions.props index bb737f240d29..8a90df8a1f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,7 +136,7 @@ 5.0.10 5.0.10 - 5.0.0-beta.21471.4 + 5.0.0-beta.21509.1 + + + + + + + + + + + + + + + + + + + + + + VersionNT64 OR + + WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)" + + + + + + + + NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME + + + + \ No newline at end of file diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs index 3375094918c0..98b5756c69de 100644 --- a/src/Installers/Windows/SharedFramework/Product.wxs +++ b/src/Installers/Windows/SharedFramework/Product.wxs @@ -35,6 +35,10 @@ + + + + @@ -52,6 +56,10 @@ + + + + @@ -66,16 +74,41 @@ + + + NOT NON_NATIVE_ARCHITECTURE + + + + NOT NON_NATIVE_ARCHITECTURE + + + + + + NON_NATIVE_ARCHITECTURE + + + + + + + NON_NATIVE_ARCHITECTURE + + + + + diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 9b9e4c6f0a7e..becd904b5ea6 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -46,6 +46,7 @@ + diff --git a/src/Installers/Windows/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs index a43f6ab4e172..8eb5a60b90d3 100644 --- a/src/Installers/Windows/TargetingPack/Product.wxs +++ b/src/Installers/Windows/TargetingPack/Product.wxs @@ -33,6 +33,10 @@ + + + + @@ -49,6 +53,10 @@ + + + + @@ -59,16 +67,41 @@ + + + NOT NON_NATIVE_ARCHITECTURE + + + + NOT NON_NATIVE_ARCHITECTURE + + + + + + + NON_NATIVE_ARCHITECTURE + + + + + + NON_NATIVE_ARCHITECTURE + + + + + diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 5cf5487b0ec6..e7132c3cee34 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -46,6 +46,7 @@ + From 4b0d34081f97054945acdecbe6df673012e2f619 Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 12 Oct 2021 17:55:14 -0700 Subject: [PATCH 18/25] Update baseline and runtime version --- eng/Baseline.Designer.props | 418 ++++++++++++++++++------------------ eng/Baseline.xml | 200 ++++++++--------- eng/Version.Details.xml | 4 +- eng/Versions.props | 6 +- 4 files changed, 314 insertions(+), 314 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 20d22823a302..98494ffe0a27 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - - + + + @@ -37,108 +37,108 @@ - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 @@ -146,110 +146,110 @@ - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - - - + + + - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 @@ -257,86 +257,86 @@ - 5.0.10 + 5.0.11 - + - + - + - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - + - + - 5.0.10 + 5.0.11 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 @@ -383,50 +383,50 @@ - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 @@ -442,27 +442,27 @@ - 5.0.10 + 5.0.11 - - + + - - + + - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 @@ -474,185 +474,185 @@ - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - - + + - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - - + + - - + + - - + + - 5.0.10 + 5.0.11 - - + + - - + + - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - + - + - 5.0.10 + 5.0.11 - + - + - 5.0.10 + 5.0.11 - - - - + + + + - 5.0.10 + 5.0.11 @@ -661,65 +661,65 @@ - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 @@ -735,42 +735,42 @@ - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - - - + + + - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 @@ -780,73 +780,73 @@ - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 - + - + - + - 5.0.10 + 5.0.11 @@ -867,11 +867,11 @@ - 5.0.10 + 5.0.11 - 5.0.10 + 5.0.11 @@ -889,13 +889,13 @@ - 5.0.10 + 5.0.11 - + - 5.0.10 + 5.0.11 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index b761464bc1c8..b80c175901ee 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44aefd03d1ad..c31a03a31004 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -298,11 +298,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f431858f8b1f1510723ace6343786c9194dbd7fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f431858f8b1f1510723ace6343786c9194dbd7fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f431858f8b1f1510723ace6343786c9194dbd7fc diff --git a/eng/Versions.props b/eng/Versions.props index 5eec5b38e2ea..abcc70178d44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 12 - false + true @@ -59,10 +59,10 @@ 5.0.0 - 5.0.11-servicing.21473.8 + 5.0.11-servicing.21474.8 5.0.0 5.0.11 - 5.0.11-servicing.21473.8 + 5.0.11-servicing.21474.8 5.0.0 5.0.0 5.0.0 From 58cec216a76a7d93b6c183a33f31fdb677383b3e Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 12 Oct 2021 19:55:10 -0700 Subject: [PATCH 19/25] Update SDK --- eng/Workarounds.props | 6 ++++++ global.json | 6 +++--- src/Razor/test/testassets/Directory.Build.props | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/eng/Workarounds.props b/eng/Workarounds.props index a56cf44b4661..8f206dac8db3 100644 --- a/eng/Workarounds.props +++ b/eng/Workarounds.props @@ -29,4 +29,10 @@ false + + + + + false + diff --git a/global.json b/global.json index ab95d8341c6d..187d937e7d94 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.401" + "version": "5.0.402" }, "tools": { - "dotnet": "5.0.401", + "dotnet": "5.0.402", "runtimes": { "dotnet/x64": [ "2.1.30", @@ -13,7 +13,7 @@ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.19" + "3.1.20" ] }, "Git": "2.22.0", diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props index ced785009b93..9dcb476437a0 100644 --- a/src/Razor/test/testassets/Directory.Build.props +++ b/src/Razor/test/testassets/Directory.Build.props @@ -17,6 +17,9 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'global.json'))\ $(RepoRoot)artifacts\bin\Microsoft.NET.Sdk.Razor\ $(MSBuildThisFileDirectory)blazor.webassembly.js + + + false From 1726f0366f2c7630647c7977107bfcab1ee6ec07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 18:44:35 +0000 Subject: [PATCH 20/25] Update dependencies from https://github.com/dotnet/arcade build 20211013.1 (#37522) [release/5.0] Update dependencies from dotnet/arcade --- NuGet.config | 4 ---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 794a418089e1..25788976f9cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -22,10 +20,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c31a03a31004..31d3e73bbf17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -313,17 +313,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f431858f8b1f1510723ace6343786c9194dbd7fc - + https://github.com/dotnet/arcade - 1f8b5698fa4c1307d9db78cd45345e0160a746fb + f7347c7eda15739dbbc6b031364729938b041b14 - + https://github.com/dotnet/arcade - 1f8b5698fa4c1307d9db78cd45345e0160a746fb + f7347c7eda15739dbbc6b031364729938b041b14 - + https://github.com/dotnet/arcade - 1f8b5698fa4c1307d9db78cd45345e0160a746fb + f7347c7eda15739dbbc6b031364729938b041b14 diff --git a/eng/Versions.props b/eng/Versions.props index abcc70178d44..eb7f76a185de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,7 +136,7 @@ 5.0.11 5.0.11 - 5.0.0-beta.21509.1 + 5.0.0-beta.21513.1 - + @@ -25,7 +25,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c586a56367d3..51fe558f0070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e7566d2a14268b0ed2e9f45e71534989b19a1db + 8d3ca1a23a881f6ff435c797a43b1d893328eee9 https://github.com/dotnet/runtime From 4ff72f930bb0c7c296dc815c9bd7cef70cf04f92 Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 13 Oct 2021 13:28:24 -0700 Subject: [PATCH 22/25] [5.0] Update SiteExtension (#37489) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb7f76a185de..412aa6039d1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 2.1.1 2.2.0 - 3.1.19-servicing-21417-13 + 3.1.20-servicing-21472-42 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From 12a668aad90aa7b1b0d315ef799529e866a7eb48 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Oct 2021 01:33:30 +0000 Subject: [PATCH 23/25] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20211013.19 System.Drawing.Common , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 5.0.2 -> To Version 5.0.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7693dbfe7db5..79b9dc60be5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75b69d4f041d..1e05cfc66895 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime e234755a116df89304d6edb35e943e9b231ccc46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 88faabc95006b38298b6377380a18b6661a9a2f1 https://github.com/dotnet/runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e234755a116df89304d6edb35e943e9b231ccc46 + 88faabc95006b38298b6377380a18b6661a9a2f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e234755a116df89304d6edb35e943e9b231ccc46 + 88faabc95006b38298b6377380a18b6661a9a2f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e234755a116df89304d6edb35e943e9b231ccc46 + 88faabc95006b38298b6377380a18b6661a9a2f1 diff --git a/eng/Versions.props b/eng/Versions.props index 371a4bda24db..287e95726946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,4 +1,4 @@ - 5.0.0 - 5.0.12-servicing.21507.8 + 5.0.12-servicing.21513.19 5.0.0 5.0.12 - 5.0.12-servicing.21507.8 + 5.0.12-servicing.21513.19 5.0.0 5.0.0 5.0.0 @@ -104,7 +104,7 @@ 5.0.1 5.0.1 5.0.1 - 5.0.2 + 5.0.3 5.0.1 5.0.0 5.0.0 From 60f58bbc0d479d3ce16df64479400c2b0e1ccc39 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 14 Oct 2021 20:36:05 +0000 Subject: [PATCH 24/25] Merged PR 19000: Revert incorrect merge for M.N.P Revert incorrect merge for M.N.P --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e05cfc66895..c2e05de62d24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -203,7 +203,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e234755a116df89304d6edb35e943e9b231ccc46 + f431858f8b1f1510723ace6343786c9194dbd7fc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -311,7 +311,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e234755a116df89304d6edb35e943e9b231ccc46 + f431858f8b1f1510723ace6343786c9194dbd7fc https://github.com/dotnet/arcade From 0bc3c376f0cd14335e8b3afca69596acabeb1f80 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 24 Oct 2021 18:19:22 +0000 Subject: [PATCH 25/25] Merged PR 19328: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b - **Build**: 20211022.7 - **Date Produced**: October 22, 2021 10:53:10 PM UTC - **Commit**: 7211aa01b34bb55ca67bdddd6e80ce23ee201bd2 - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Drawing.Common**: [from 5.0.3 to 5.0.3][1] - **Microsoft.NETCore.App.Internal**: [from 5.0.12-servicing.21513.19 to 5.0.12-servicing.21522.7][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.12 to 5.0.12][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.12-servicing.21513.19 to 5.0.12-servicing.21522.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC88faabc&targetVersion=GC7211aa0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b) --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3dc1c3146024..46036d3c7333 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,12 @@ + + - + @@ -23,9 +25,11 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d107d69c2783..8569da565b88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,7 +207,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 88faabc95006b38298b6377380a18b6661a9a2f1 + 7211aa01b34bb55ca67bdddd6e80ce23ee201bd2 https://github.com/dotnet/runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 88faabc95006b38298b6377380a18b6661a9a2f1 + 7211aa01b34bb55ca67bdddd6e80ce23ee201bd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 88faabc95006b38298b6377380a18b6661a9a2f1 + 7211aa01b34bb55ca67bdddd6e80ce23ee201bd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 88faabc95006b38298b6377380a18b6661a9a2f1 + 7211aa01b34bb55ca67bdddd6e80ce23ee201bd2 diff --git a/eng/Versions.props b/eng/Versions.props index 287e95726946..2899aec06a7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.12-servicing.21513.19 + 5.0.12-servicing.21522.7 5.0.0 5.0.12 - 5.0.12-servicing.21513.19 + 5.0.12-servicing.21522.7 5.0.0 5.0.0 5.0.0