From df13328c596dcea58f21f8625d2e848995431e71 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Aug 2022 16:41:17 -0700 Subject: [PATCH 01/78] use mktemp to correctly use temp files --- src/redist/targets/packaging/deb/postinst | 3 +-- src/redist/targets/packaging/osx/clisdk/scripts/postinstall | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst index 615c17e6b..696ec8acc 100644 --- a/src/redist/targets/packaging/deb/postinst +++ b/src/redist/targets/packaging/deb/postinst @@ -4,6 +4,5 @@ first_run() { /usr/share/dotnet/dotnet exec /usr/share/dotnet/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true } -INSTALL_TEMP_HOME=/tmp/dotnet-installer -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run diff --git a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall index 28339be99..86710223d 100644 --- a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall +++ b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall @@ -12,7 +12,7 @@ first_run() { $INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true } -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run exit 0 From 7d9eddf1c0b8a408f0074a7307b4a068e9efec6c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 15:08:05 +0000 Subject: [PATCH 02/78] Merged PR 26816: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22511.7 to 7.0.0-rtm.22517.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22517.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.0.5-beta.22510.6 to 12.4.0-beta.22513.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22510.6 to 7.0.0-beta.22513.2 (... --- NuGet.config | 20 +- eng/Version.Details.xml | 174 +++++++++--------- eng/Versions.props | 46 ++--- .../job/source-build-run-tarball-build.yml | 17 +- 4 files changed, 136 insertions(+), 121 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d004c295..64e2f1aae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,20 @@ + + + + + + + + + + + + - + @@ -29,9 +41,15 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8cfdc859..e86da2f3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,45 +2,45 @@ - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 - - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/winforms - 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 77b444d039791bf7acf4869f99de695b28d7d6ef - - https://github.com/dotnet/wpf - fd949cc0bee03dece87b7430fbba99f150632b9d + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + d8beab3a71f4dab53451bf194f6da7e09dbb43ef - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + e142005b5b992da4c04f56bdb287d685da55989c - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + e142005b5b992da4c04f56bdb287d685da55989c @@ -144,32 +144,32 @@ linker - + https://github.com/dotnet/roslyn - a9c49e8b8633005d2d03516693950037a9cf7cc7 + 0d6b4d8dcb8fe7a447cfd604d6cbd4d617f7af56 - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 + 0a4ea3c41cfd6c0c0b86bad45311c40632e4937e - + https://github.com/nuget/nuget.client - 1a082949ae5b6da7ca2cce047396c53ae1afdde7 + 125f673fd1cdb3cc012f62aa3ce764d2460b89eb https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/source-build-reference-packages - 8366acfc3e0660ceef6bddbe7794044e5d503521 + fb2dd1b6d4b8809014d2f91e645b683b718419fa diff --git a/eng/Versions.props b/eng/Versions.props index d393c52c1..4cb3d78e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22511.7 + 7.0.0-rtm.22517.2 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22517.5 @@ -50,44 +50,44 @@ - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 0.2.0 - 7.0.100-rtm.22512.19 - 7.0.100-rtm.22512.19 - 7.0.100-rtm.22512.19 + 7.0.100 + 7.0.100-rtm.22517.33 + 7.0.100-rtm.22517.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22511.4 + 7.0.0 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22513.8 + 7.0.0-rtm.22513.8 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.0-rtm.22511.3 - 7.0.0-rtm.22511.3 + 7.0.0-rtm.22517.5 + 7.0.0-rtm.22517.5 7.0.0 7.0.0 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 60b39b652..cc8e47e41 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -70,22 +70,19 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ parameters.poolInternalAmd64 }} -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 dependsOn: ${{ parameters.dependsOn }} - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Debian11-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} From d6aa95b9131d452873b263b456ab624672fd656e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:34:39 +0000 Subject: [PATCH 03/78] Merged PR 26854: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-3.22514.7 to 4.4.0-3.22518.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.4.0-preview-22512-01 to 17.4.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221018.28 - **Date Produced**: October 19, 2022 6:19:08 AM UTC - **Commit**: 348f3ff5255a687223425710282e61f16cc19c7b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22517.33 to 7.0.100-rtm.22518.28][6] - **Microsoft.... --- NuGet.config | 18 +++++++---- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++------ 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64e2f1aae..396734415 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,24 @@ - + + + + + - + - + + @@ -41,14 +46,15 @@ - + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e86da2f3c..f8a2f6e05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6bcf305203796b050f9370b14fd305d7f864c7b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bebb59597c8f98828b4cf2ae7724b277b15c47ee + d099f075e45d2aa6007a22b71b45a08758559f80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + 2d456a1df1619622ab8c25566aa3f1deab7c0736 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b26d61dc58ed308926bc4c73949bc7c1613b89f + 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b26d61dc58ed308926bc4c73949bc7c1613b89f + 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b26d61dc58ed308926bc4c73949bc7c1613b89f + 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b26d61dc58ed308926bc4c73949bc7c1613b89f + 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 @@ -144,15 +144,15 @@ linker - + https://github.com/dotnet/roslyn - 0d6b4d8dcb8fe7a447cfd604d6cbd4d617f7af56 + 7856a68c109b22de70e07580018fec601e944f46 - + https://github.com/dotnet/msbuild - 0a4ea3c41cfd6c0c0b86bad45311c40632e4937e - + 18d5aef85920037c9d6ff49b1215a4daf515197f + https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 4cb3d78e0..7633196d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.0 7.0.0 - 7.0.0-rtm.22517.16 - 7.0.0-rtm.22517.16 - 7.0.0-rtm.22517.16 - 7.0.0-rtm.22517.16 - 7.0.0-rtm.22517.16 + 7.0.0-rtm.22518.10 + 7.0.0-rtm.22518.10 + 7.0.0-rtm.22518.10 + 7.0.0-rtm.22518.10 + 7.0.0-rtm.22518.10 0.2.0 @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22517.33 - 7.0.100-rtm.22517.33 + 7.0.100-rtm.22518.37 + 7.0.100-rtm.22518.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.0-rtm.22513.8 - 7.0.0-rtm.22513.8 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 From 55ea5a6ae3537f5689a3bfc9042fed04361ae046 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:35:13 +0000 Subject: [PATCH 04/78] Merged PR 26890: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.3 - **Date Produced**: October 19, 2022 3:14:47 PM UTC - **Commit**: 149c427f8260d998e3c77012d2da361d649bf573 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.0 to 7.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-dev-certs**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-user-jwts**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-user-secrets**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8b2d10a&targetVersion=GC149c427&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC2d456a1&targetVersion=GCbb01bbf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (En... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 396734415..61de1f04a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -46,12 +46,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8a2f6e05..7920cf0e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2d456a1df1619622ab8c25566aa3f1deab7c0736 + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 + 149c427f8260d998e3c77012d2da361d649bf573 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 + 149c427f8260d998e3c77012d2da361d649bf573 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 + 149c427f8260d998e3c77012d2da361d649bf573 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b2d10a9fc937846f54442addbeaa5432eb8d8b6 + 149c427f8260d998e3c77012d2da361d649bf573 diff --git a/eng/Versions.props b/eng/Versions.props index 7633196d5..125ca0240 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.0 7.0.0 - 7.0.0-rtm.22518.10 - 7.0.0-rtm.22518.10 - 7.0.0-rtm.22518.10 - 7.0.0-rtm.22518.10 - 7.0.0-rtm.22518.10 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22518.37 - 7.0.100-rtm.22518.37 + 7.0.100-rtm.22519.3 + 7.0.100-rtm.22519.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d127e47bd0955571b1179b9491d009de95d8f909 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:47:13 +0000 Subject: [PATCH 05/78] Merged PR 26893: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.9 - **Date Produced**: October 19, 2022 4:16:20 PM UTC - **Commit**: 8f23e1401dbb16272293b3cbb7af91d3b775bf75 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC149c427&targetVersion=GC8f23e14&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- 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 61de1f04a..ee268151c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7920cf0e4..6e6b80209 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 149c427f8260d998e3c77012d2da361d649bf573 + 8f23e1401dbb16272293b3cbb7af91d3b775bf75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 149c427f8260d998e3c77012d2da361d649bf573 + 8f23e1401dbb16272293b3cbb7af91d3b775bf75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 149c427f8260d998e3c77012d2da361d649bf573 + 8f23e1401dbb16272293b3cbb7af91d3b775bf75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 149c427f8260d998e3c77012d2da361d649bf573 + 8f23e1401dbb16272293b3cbb7af91d3b775bf75 diff --git a/eng/Versions.props b/eng/Versions.props index 125ca0240..e22533092 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.3 - 7.0.100-rtm.22519.3 + 7.0.100-rtm.22519.9 + 7.0.100-rtm.22519.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74ab822fa89adae6336771a1f0a561997a1fe7e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:13:51 +0000 Subject: [PATCH 06/78] Merged PR 26897: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.13 - **Date Produced**: October 19, 2022 5:31:15 PM UTC - **Commit**: f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.0 to 7.0.0][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f23e14&targetVersion=GCf1a8727&_a=fil... --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee268151c..766ccb4de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,11 +20,10 @@ - + - - + @@ -51,11 +50,10 @@ - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e6b80209..46a6c3e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6bcf305203796b050f9370b14fd305d7f864c7b8 + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6bcf305203796b050f9370b14fd305d7f864c7b8 + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6bcf305203796b050f9370b14fd305d7f864c7b8 + 417429fc040af552532bb07aad29e5e8639b840f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6bcf305203796b050f9370b14fd305d7f864c7b8 + 417429fc040af552532bb07aad29e5e8639b840f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f23e1401dbb16272293b3cbb7af91d3b775bf75 + f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f23e1401dbb16272293b3cbb7af91d3b775bf75 + f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f23e1401dbb16272293b3cbb7af91d3b775bf75 + f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f23e1401dbb16272293b3cbb7af91d3b775bf75 + f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 77b444d039791bf7acf4869f99de695b28d7d6ef + e83409daa530605da4eb5f847c6740a520325d25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d8beab3a71f4dab53451bf194f6da7e09dbb43ef + 636e2b7a00a434a354a126f510a56e16ce3c6bbc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e22533092..5602385a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22517.2 + 7.0.0-rtm.22518.7 - 7.0.0-rtm.22517.5 + 7.0.0-rtm.22518.2 @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.9 - 7.0.100-rtm.22519.9 + 7.0.100-rtm.22519.13 + 7.0.100-rtm.22519.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.0-rtm.22517.5 - 7.0.0-rtm.22517.5 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 7.0.0 7.0.0 From 0ad802413164ad52b5b5c628d8eb8a4ffda66a52 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 20:08:13 +0000 Subject: [PATCH 07/78] Merged PR 26919: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Test.Sdk**: from 17.4.0-release-20220926-01 to 17.4.0-release-20221019-01 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.25 - **Date Produced**: October 19, 2022 7:42:39 PM UTC - **Commit**: 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.NET.Test.Sdk**: [from 17.4.0-release-20220926-01 to 17.4.0-release-20221019-01][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf1a8727&targetVersion=GC78ffdbb&_a=files [2]: https://github.com/microsoft/vstest/compare/576a7cc...c02ece8 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 766ccb4de..79714f5ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46a6c3e99..2629db789 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1a8727d38b1e5f2795ed86ec2692edeaa35b042 + 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1a8727d38b1e5f2795ed86ec2692edeaa35b042 + 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1a8727d38b1e5f2795ed86ec2692edeaa35b042 + 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1a8727d38b1e5f2795ed86ec2692edeaa35b042 + 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd @@ -133,9 +133,9 @@ e142005b5b992da4c04f56bdb287d685da55989c - + https://github.com/microsoft/vstest - 576a7cc1b259976393cf576a6a9c5df967bb2b7d + c02ece877c62577810f893c44279ce79af820112 diff --git a/eng/Versions.props b/eng/Versions.props index 5602385a9..2eb0f9b5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.13 - 7.0.100-rtm.22519.13 + 7.0.100-rtm.22519.25 + 7.0.100-rtm.22519.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-release-20220926-01 + 17.4.0-release-20221019-01 From aa035899190349e7e6e4f6e609a68318b68506c6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 22:58:44 +0000 Subject: [PATCH 08/78] Merged PR 26934: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.FSharp.Compiler**: from 12.4.0-beta.22513.2 to 12.4.0-beta.22513.10 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22513.2 to 7.0.0-beta.22513.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.32 - **Date Produced**: October 19, 2022 10:14:41 PM UTC - **Commit**: 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.FSharp.Compiler**: [from 12.4.0-beta.22513.2 to 12.4.0-beta.22513.10][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.0-beta.22513.2 to 7.0.0-beta.22513.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC78ffdbb&targetVersion=GC513aacc&_a=files [2]: https://github.com/dotnet/fsharp/compare/e142005...c370ee0 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 79714f5ec..90a0c3d12 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2629db789..7988665cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd + 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd + 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd + 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd + 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - e142005b5b992da4c04f56bdb287d685da55989c + c370ee09c2eebcc750a59e9c10e52792679f896e - + https://github.com/dotnet/fsharp - e142005b5b992da4c04f56bdb287d685da55989c + c370ee09c2eebcc750a59e9c10e52792679f896e diff --git a/eng/Versions.props b/eng/Versions.props index 2eb0f9b5e..93a0bf1c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.25 - 7.0.100-rtm.22519.25 + 7.0.100-rtm.22519.32 + 7.0.100-rtm.22519.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ca72034b43ddbaf0215931deeefc4c511113ba6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 20 Oct 2022 02:13:03 +0000 Subject: [PATCH 09/78] Merged PR 26943: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.39 - **Date Produced**: October 20, 2022 1:19:35 AM UTC - **Commit**: 6efaab2a54c46522d3241c0bf64df9e67e35cc9b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC513aacc&targetVersion=GC6efaab2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- 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 90a0c3d12..b64f43e4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7988665cb..97452bd16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce + 6efaab2a54c46522d3241c0bf64df9e67e35cc9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce + 6efaab2a54c46522d3241c0bf64df9e67e35cc9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce + 6efaab2a54c46522d3241c0bf64df9e67e35cc9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce + 6efaab2a54c46522d3241c0bf64df9e67e35cc9b diff --git a/eng/Versions.props b/eng/Versions.props index 93a0bf1c1..601aafb16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.32 - 7.0.100-rtm.22519.32 + 7.0.100-rtm.22519.39 + 7.0.100-rtm.22519.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e41c41027edcbda839b5b379ebb1f43d96db1b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 20 Oct 2022 16:43:01 +0000 Subject: [PATCH 10/78] Merged PR 26944: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-3.22518.13 to 4.4.0-4.22519.21 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.46 - **Date Produced**: October 20, 2022 6:38:33 AM UTC - **Commit**: 962460f12e44a2931544e5ec1c55d9ea99b99f21 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.Net.Compilers.Toolset**: [from 4.4.0-3.22518.13 to 4.4.0-4.22519.21][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6efaab2&targetVersion=GC962460f&_a=files [2]: https://github.com/dotnet/roslyn/compare/7856a68...df3e083 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index b64f43e4a..e5e36e5db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97452bd16..b1a7d5bf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6efaab2a54c46522d3241c0bf64df9e67e35cc9b + 962460f12e44a2931544e5ec1c55d9ea99b99f21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6efaab2a54c46522d3241c0bf64df9e67e35cc9b + 962460f12e44a2931544e5ec1c55d9ea99b99f21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6efaab2a54c46522d3241c0bf64df9e67e35cc9b + 962460f12e44a2931544e5ec1c55d9ea99b99f21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6efaab2a54c46522d3241c0bf64df9e67e35cc9b + 962460f12e44a2931544e5ec1c55d9ea99b99f21 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 7856a68c109b22de70e07580018fec601e944f46 + df3e083dcf4840d0b6bce1d021384f0fc606fe9f diff --git a/eng/Versions.props b/eng/Versions.props index 601aafb16..b200668bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.39 - 7.0.100-rtm.22519.39 + 7.0.100-rtm.22519.46 + 7.0.100-rtm.22519.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c8dad9b0ce545fe0bb7cddeeafd52568270e4c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 Oct 2022 07:14:09 +0000 Subject: [PATCH 11/78] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221020.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index e5e36e5db..3b8e12acb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -20,10 +24,12 @@ - + + + @@ -45,14 +51,18 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1a7d5bf7..15201930b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962460f12e44a2931544e5ec1c55d9ea99b99f21 + 12d708d6411df281d22e7e8f7db8b0e53f28a21d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962460f12e44a2931544e5ec1c55d9ea99b99f21 + 12d708d6411df281d22e7e8f7db8b0e53f28a21d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962460f12e44a2931544e5ec1c55d9ea99b99f21 + 12d708d6411df281d22e7e8f7db8b0e53f28a21d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962460f12e44a2931544e5ec1c55d9ea99b99f21 + 12d708d6411df281d22e7e8f7db8b0e53f28a21d diff --git a/eng/Versions.props b/eng/Versions.props index b200668bc..f431cb925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22519.46 - 7.0.100-rtm.22519.46 + 7.0.100-rtm.22520.9 + 7.0.100-rtm.22520.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5eb1a4aac6a75a3ec07fa6057fbb156e245a9747 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 Oct 2022 08:49:01 +0000 Subject: [PATCH 12/78] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221021.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-4.22519.21 -> To Version 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b8e12acb..f956f556c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15201930b..f496487c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 12d708d6411df281d22e7e8f7db8b0e53f28a21d + 3f5d10b14799511fdc0e12eed2ad32eb51de840d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 12d708d6411df281d22e7e8f7db8b0e53f28a21d + 3f5d10b14799511fdc0e12eed2ad32eb51de840d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 12d708d6411df281d22e7e8f7db8b0e53f28a21d + 3f5d10b14799511fdc0e12eed2ad32eb51de840d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 12d708d6411df281d22e7e8f7db8b0e53f28a21d + 3f5d10b14799511fdc0e12eed2ad32eb51de840d @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - df3e083dcf4840d0b6bce1d021384f0fc606fe9f + 9e075f038a19d493244bc18997fc52a6c6eefa72 diff --git a/eng/Versions.props b/eng/Versions.props index f431cb925..5cfafa02f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22520.9 - 7.0.100-rtm.22520.9 + 7.0.100-rtm.22521.2 + 7.0.100-rtm.22521.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18d71e1b5ab09268a3e915fd1374df60e2f724be Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 Oct 2022 23:12:36 +0000 Subject: [PATCH 13/78] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221021.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-4.22519.21 -> To Version 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk --- 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 f956f556c..1ebc99984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f496487c1..650b4c68e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d10b14799511fdc0e12eed2ad32eb51de840d + 882a576873b701f79d6584e4a0cf84036fdcd83f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d10b14799511fdc0e12eed2ad32eb51de840d + 882a576873b701f79d6584e4a0cf84036fdcd83f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d10b14799511fdc0e12eed2ad32eb51de840d + 882a576873b701f79d6584e4a0cf84036fdcd83f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d10b14799511fdc0e12eed2ad32eb51de840d + 882a576873b701f79d6584e4a0cf84036fdcd83f diff --git a/eng/Versions.props b/eng/Versions.props index 5cfafa02f..b2330f533 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22521.2 - 7.0.100-rtm.22521.2 + 7.0.100-rtm.22521.7 + 7.0.100-rtm.22521.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd20a7aec63381294f027e608be848cba2bba65f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Oct 2022 17:40:02 +0000 Subject: [PATCH 14/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221024.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22524.1 --- 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 35f36b8ec..ab210ee70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 2477d388d8663fe6a3f1c82376600dbb19bd217d + 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 From 1c98222124d160734055f25d134b063835713e6a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 25 Oct 2022 17:02:51 +0000 Subject: [PATCH 15/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b5c5c827..6bfce60af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,9 +19,11 @@ + + @@ -41,14 +44,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab210ee70..a5716024f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 + 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 From 6d7d4ef5f30c188ab373630979d446528fecdde1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 26 Oct 2022 05:01:22 +0000 Subject: [PATCH 16/78] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221025.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ebc99984..6f49a6cef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,11 +8,13 @@ + + @@ -22,12 +24,14 @@ + - + + @@ -53,16 +57,19 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 650b4c68e..18d41bd80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + 86457a8ee126653ca38a5330a68e380a1da158e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + 86457a8ee126653ca38a5330a68e380a1da158e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + 86457a8ee126653ca38a5330a68e380a1da158e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + 86457a8ee126653ca38a5330a68e380a1da158e8 diff --git a/eng/Versions.props b/eng/Versions.props index b2330f533..22c956d50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.100 - 7.0.100-rtm.22521.7 - 7.0.100-rtm.22521.7 + 7.0.100-rtm.22525.10 + 7.0.100-rtm.22525.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48cf81fcc68a992c756421937cfb876f89e44cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 23:40:32 +0000 Subject: [PATCH 17/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22513.1 -> To Version 6.0.0-servicing.22525.2 --- NuGet.config | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6bfce60af..f8607453f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,15 +16,10 @@ - - - - - @@ -45,17 +41,13 @@ + - - - - - From 3d646e4314f8af03f9e5d00f407a8b35d149c592 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Nov 2022 23:50:58 +0000 Subject: [PATCH 18/78] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/dotnet-install.sh | 4 ++-- global.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbe35e32c..c41a7919b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7f4551eba..ed9b51bb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.2 + 6.0.0-beta.22558.7 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e..b09ea669f 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index b779ff3ff..8facf9ad2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" } } From a37b94428373178f66775791a8ea5ab0a9681a09 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 05:28:18 +0000 Subject: [PATCH 19/78] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22558.7 --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/dotnet-install.sh | 4 ++-- eng/common/init-tools-native.ps1 | 1 + global.json | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8607453f..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -40,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5716024f..f2aefea3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + a7773a9828c67a9b1fba3d2daee061ec90db3505 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ebdb6d1f5..27d9d8d29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22463.7 + 6.0.0-beta.22558.7 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..33a6f2d0e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e..b09ea669f 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef880..6c7a851a8 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 9d1e2d901..8facf9ad2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" } } From 86fd9340d4cc032919d41ddcb92832b2e1190a9d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Nov 2022 10:49:39 -0800 Subject: [PATCH 20/78] Update asp.net templates (#14955) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ed9b51bb6..882809fcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.30 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 From 364781dce558ed570ceaeef49e3ee44163183757 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Nov 2022 10:49:47 -0800 Subject: [PATCH 21/78] Update asp.net templates (#14956) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ebdb6d1f5..681d9c657 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.30 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 From b3add4e9b98b4ab96bee412cc864ba66dd224ae7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 19:09:15 +0000 Subject: [PATCH 22/78] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1 --- 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 f2aefea3e..cd92817aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 62921932b..5256df87a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.7 + 6.0.0-beta.22560.1 diff --git a/global.json b/global.json index 8facf9ad2..e7ba925c7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" } } From 2db4ff9fc1bf937aee99f96904acd1b04504c549 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:07:31 -0800 Subject: [PATCH 23/78] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 (#14985) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1 Co-authored-by: dotnet-maestro[bot] --- 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 c41a7919b..e9113359c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 882809fcd..9dac58381 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22558.7 + 6.0.0-beta.22560.1 diff --git a/global.json b/global.json index 8facf9ad2..e7ba925c7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" } } From 4ee7cf8ded456144d84851a60b9b7a64bbdacbee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 21:15:04 +0000 Subject: [PATCH 24/78] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22560.1 -> To Version 6.0.0-beta.22561.1 --- 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 e9113359c..bb8d05004 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9dac58381..85d38fc12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22560.1 + 6.0.0-beta.22561.1 diff --git a/global.json b/global.json index e7ba925c7..30864f9a7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" } } From b11f5b701c6acfcafe8c955c26865d6268c11cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 21:33:39 +0000 Subject: [PATCH 25/78] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22561.1 --- 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 cd92817aa..58a7a8f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5256df87a..ad5802566 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22560.1 + 6.0.0-beta.22561.1 diff --git a/global.json b/global.json index e7ba925c7..30864f9a7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" } } From e47b02315a26e457f16c293a60abcdd4f381fd84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 18:16:09 +0000 Subject: [PATCH 26/78] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221115.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.306-servicing.22523.22 -> To Version 6.0.307-servicing.22565.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.11 -> To Version 6.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..de1764744 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58a7a8f4e..6fc565e6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46b48e7a82d138728be2d24594b5ce98d6af92dc + ae169984a721fadfe846a046b44a83bc039c329f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46b48e7a82d138728be2d24594b5ce98d6af92dc + ae169984a721fadfe846a046b44a83bc039c329f diff --git a/eng/Versions.props b/eng/Versions.props index ad5802566..8268cf49a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.306 + 6.0.307 @@ -44,20 +44,20 @@ - 6.0.11 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12 + 6.0.12 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 0.2.0 - 6.0.306-servicing.22523.22 - 6.0.306-servicing.22523.22 + 6.0.307-servicing.22565.5 + 6.0.307-servicing.22565.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22561.4 + 6.0.12-servicing.22561.4 + 6.0.12 + 6.0.12 + 6.0.12 + 6.0.12 2.1.0 - 6.0.11-servicing.22523.3 - 6.0.11-servicing.22523.3 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22554.3 + 6.0.12-servicing.22554.3 + 6.0.12 + 6.0.12 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.306 + 6.0.307 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 0bc87ae443855456a9e27de165da00754775b21c Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Nov 2022 18:22:56 -0800 Subject: [PATCH 27/78] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7707ace1a..2bf456f30 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.27 - 10.0.18362.27 - 10.0.19041.27 - 10.0.20348.27 - 10.0.22000.27 - 10.0.22621.27 + 10.0.17763.28 + 10.0.18362.28 + 10.0.19041.28 + 10.0.20348.28 + 10.0.22000.28 + 10.0.22621.28 From 1fca57de6087be75b0999915f8797f4cedee92e6 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Nov 2022 18:24:05 -0800 Subject: [PATCH 28/78] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7707ace1a..2bf456f30 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.27 - 10.0.18362.27 - 10.0.19041.27 - 10.0.20348.27 - 10.0.22000.27 - 10.0.22621.27 + 10.0.17763.28 + 10.0.18362.28 + 10.0.19041.28 + 10.0.20348.28 + 10.0.22000.28 + 10.0.22621.28 From 030676c5c3f41fc251b71f4b7fce754450b8791b Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Nov 2022 18:25:09 -0800 Subject: [PATCH 29/78] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7707ace1a..2bf456f30 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.27 - 10.0.18362.27 - 10.0.19041.27 - 10.0.20348.27 - 10.0.22000.27 - 10.0.22621.27 + 10.0.17763.28 + 10.0.18362.28 + 10.0.19041.28 + 10.0.20348.28 + 10.0.22000.28 + 10.0.22621.28 From 958a92b77c43e25035ef2505a82358d1d9d49b28 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Nov 2022 16:55:23 +0000 Subject: [PATCH 30/78] Merged PR 27536: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221116.5 - **Date Produced**: November 16, 2022 6:08:24 PM UTC - **Commit**: 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22565.5 to 6.0.307-servicing.22566.5][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22565.5 to 6.0.307-servicing.22566.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22564.30 to 6.0.12-servicing.22565.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCae16998&targetVersion=GC14940c9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC621e64b&targetVersion=GC441cb92&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index de1764744..fe4877de7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fc565e6e..db1e290c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae169984a721fadfe846a046b44a83bc039c329f + 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae169984a721fadfe846a046b44a83bc039c329f + 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc diff --git a/eng/Versions.props b/eng/Versions.props index 8268cf49a..cf52dcf31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 0.2.0 - 6.0.307-servicing.22565.5 - 6.0.307-servicing.22565.5 + 6.0.307-servicing.22566.5 + 6.0.307-servicing.22566.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9299e47ab51e7a3dab89f3eb67bb4fb3d9bdc1c7 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 17 Nov 2022 14:54:28 -0800 Subject: [PATCH 31/78] [release/6.0.1xx] Add CI for security-partners-dotnet (#14963) * Add CI for dotnet-security-partners * Remove nuget configs from all repo submodules * Address code review * Move security-partners ci to tarball/eng dir * Copy out installer NuGet config before build * Fix relative path for installer template * Update src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml Co-authored-by: Michael Simons * Revert "Remove nuget configs from all repo submodules" This reverts commit 87b8a2c523eb03a5d3eee1dcde3e01c15bddc3d2. Co-authored-by: Michael Simons --- .../job/source-build-build-tarball.yml | 70 +++++++++++-------- .../pipelines/security-partners-dotnet.yml | 18 +++++ 2 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index ff035940f..b7318d262 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -43,7 +43,15 @@ jobs: - name: additionalBuildArgs value: --with-sdk /tarball/.dotnet - name: tarballDir - value: $(Build.StagingDirectory)/tarball + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) workspace: clean: all @@ -51,19 +59,28 @@ jobs: - checkout: self clean: true - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball - - download: ${{ parameters.installerBuildResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Source Tarball + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} @@ -84,20 +101,6 @@ jobs: Contents: '*.tar.gz' TargetFolder: $(tarballDir)/packages/archive/ - - script: | - set -x - - resourceIdPathSegment= - if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then - resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' - fi - - mkdir -p "$(tarballDir)" - tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" - eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" - eval rm -f "$tarballFilePath" - displayName: Extract Tarball - - script: | set -x @@ -135,13 +138,18 @@ jobs: docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) displayName: Build Tarball + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | set -x - # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - cp $(Build.SourcesDirectory)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - dockerVolumeArgs="-v $(tarballDir):/tarball" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" poisonArg='' diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..f96c9fb37 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,18 @@ +trigger: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From 262e147b0fdfeff7c35c4dc59162efb2aa273a31 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 03:05:33 +0000 Subject: [PATCH 32/78] Merged PR 27620: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22561.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22561.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22565.8 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22564.26 to 6.0.307-servicing.22564.36 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221117.19 - **Date Produced**: November 17, 2022 10:16:18 PM UTC - **Commit**: 9111e1c94790e09cf4743a2571d8c4fa660ad37d - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22566.5 to 6.0.307-servicing.22567.19][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22566.5 to 6.0.307-servicing.22567.19][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22561.4 t... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe4877de7..b05b9cb3c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db1e290c1..b9f1966d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc + 9111e1c94790e09cf4743a2571d8c4fa660ad37d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14940c9d58ec2de2a3f55e669f85eeb8573fb7cc + 9111e1c94790e09cf4743a2571d8c4fa660ad37d diff --git a/eng/Versions.props b/eng/Versions.props index cf52dcf31..fe7cb3d9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 0.2.0 - 6.0.307-servicing.22566.5 - 6.0.307-servicing.22566.5 + 6.0.307-servicing.22567.19 + 6.0.307-servicing.22567.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22561.4 - 6.0.12-servicing.22561.4 + 6.0.12-servicing.22566.2 + 6.0.12-servicing.22566.2 6.0.12 6.0.12 6.0.12 From d0a2e7a4be924164f800631ffeb139af90d853b6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 16:11:28 +0000 Subject: [PATCH 33/78] Merged PR 27640: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221117.31 - **Date Produced**: November 18, 2022 3:03:04 AM UTC - **Commit**: 68caa23a95462cda1e340e8fe4789125422fcda1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22567.19 to 6.0.307-servicing.22567.31][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22567.19 to 6.0.307-servicing.22567.31][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9111e1c&targetVersion=GC68caa23&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC7f5bdb9&targetVersion=GC42a1b9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b05b9cb3c..1dc2e5478 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9f1966d3..8694529b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9111e1c94790e09cf4743a2571d8c4fa660ad37d + 68caa23a95462cda1e340e8fe4789125422fcda1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9111e1c94790e09cf4743a2571d8c4fa660ad37d + 68caa23a95462cda1e340e8fe4789125422fcda1 diff --git a/eng/Versions.props b/eng/Versions.props index fe7cb3d9a..1401ec5ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22567.19 - 6.0.307-servicing.22567.19 + 6.0.307-servicing.22567.31 + 6.0.307-servicing.22567.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7ab730194bc086ed0696688fc9c438b8de4de54 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 18:20:53 +0000 Subject: [PATCH 34/78] Merged PR 27621: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22523.6 to 6.0.404-rtm.22567.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22478.1 to 6.0.200-1.22553.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.3.1-3.22505.12 to 4.3.1-3.22526.13 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221117.20 - **Date Produced**: November 17, 2022 10:16:52 PM UTC - **Commit**: c816d3f1331a8e81e166d4543d81efbca0168a19 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.23 to 6.0.... --- NuGet.config | 6 ++++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 60 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..74cf836b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,10 +40,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e10ce34fd..769fa0af3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b + 54b1902dd65349f55552c8af533293cd4ac4def9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b + 54b1902dd65349f55552c8af533293cd4ac4def9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3d823d128e0aafaa65c57b9bfa53d208db2f9d9b + 54b1902dd65349f55552c8af533293cd4ac4def9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 + 128990fc9e7041579b0acafb721b6f996f62e5c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 + 128990fc9e7041579b0acafb721b6f996f62e5c0 @@ -135,15 +135,15 @@ 83d2f8162d29a66a8ff323c4bba93c8250013511 - + https://github.com/dotnet/linker - 50c2ec00b794ebd130402d51b960c69cfc9ee622 + 4be765525a1b45d28ab69a48f92e008b70a4e56e linker - + https://github.com/dotnet/roslyn - 954930214e5a116e3aa1f81cab887b294ae95739 + 41a5af9d2c459a06c0795bf21a1c046200f375bf diff --git a/eng/Versions.props b/eng/Versions.props index a497d5519..67f308f8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.403 + 6.0.404 @@ -44,20 +44,20 @@ - 6.0.11 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12 + 6.0.12 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 0.2.0 - 6.0.403-servicing.22523.23 - 6.0.403-servicing.22523.23 + 6.0.404-servicing.22568.3 + 6.0.404-servicing.22568.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22566.2 + 6.0.12-servicing.22566.2 + 6.0.12 + 6.0.12 + 6.0.12 + 6.0.12 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.403 + 6.0.404 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 28c8bf2dfc29e91d4a4f43bce544c6ac6e26de2c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 19 Nov 2022 15:41:05 +0000 Subject: [PATCH 35/78] Merged PR 27591: Override some versions for nonshipping runtime packages. Source-build 7.0.0 created these packages with an incorrect version number which is stuck in the previously-source-built PVP for the 7.0.1 release. This causes a problem if bootstapping because the Microsoft versions of these packages don't actually exist, so trying to download them fails. This change allows us to override the version read out of PVP and set it to the actual version used by runtime. --- .../eng/bootstrap/OverrideBootstrapVersions.props | 11 +++++++++++ .../eng/bootstrap/buildBootstrapPreviouslySB.csproj | 1 + src/SourceBuild/tarball/content/prep.sh | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props new file mode 100644 index 000000000..d0a05029f --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -0,0 +1,11 @@ + + + + 7.0.0-rtm.22518.5 + + $(NonshippingRuntimeVersionFor700) + $(NonshippingRuntimeVersionFor700) + $(NonshippingRuntimeVersionFor700) + + diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 9a00e2a48..a22d70373 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -2,6 +2,7 @@ + net7.0 diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 27562569c..b436e6cff 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" # Remove working directory rm -rf $workingDir From 224289d7fb63f0b1d8c24b580c1f2a661c5e5818 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 20 Nov 2022 01:42:16 +0000 Subject: [PATCH 36/78] Merged PR 27685: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221119.2 - **Date Produced**: November 19, 2022 6:06:33 PM UTC - **Commit**: 088530583952a8bc3348eedca0403b7e8dc37012 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22567.31 to 6.0.307-servicing.22569.2][4] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22567.31 to 6.0.307-servicing.22569.2][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][5] - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.12][5] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][5] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][5] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.12 to 6.0.12][5] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.12 to 6.0.12][5] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][6] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][6] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **dotnet-dev-certs**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **dotnet-user-secrets**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][6] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][7] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22567.7 to 6.0.307-servicing.22568.6][7] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][7] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC68caa23&targetVersion=GC0885305&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301f927&targetVersion=GC02e45a4&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC086f577&targetVersion=GC6a747bb&_a=files [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC42a1b9e&targetVersion=GC16555ee&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescription... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1dc2e5478..b2164ea3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8694529b0..3b934bddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68caa23a95462cda1e340e8fe4789125422fcda1 + 088530583952a8bc3348eedca0403b7e8dc37012 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68caa23a95462cda1e340e8fe4789125422fcda1 + 088530583952a8bc3348eedca0403b7e8dc37012 diff --git a/eng/Versions.props b/eng/Versions.props index 1401ec5ab..04f09e8d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 0.2.0 - 6.0.307-servicing.22567.31 - 6.0.307-servicing.22567.31 + 6.0.307-servicing.22569.2 + 6.0.307-servicing.22569.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22566.2 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 6.0.12 6.0.12 6.0.12 From 13fcc4c2804478056df7158bec00e5f4bc72258b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 20 Nov 2022 01:44:05 +0000 Subject: [PATCH 37/78] Merged PR 27686: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22567.9 to 6.0.404-rtm.22568.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221119.3 - **Date Produced**: November 19, 2022 6:04:19 PM UTC - **Commit**: 8079819072dc5e548ec11142b660908d28125a67 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22568.3 to 6.0.404-servicing.22569.3][3] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22568.3 to 6.0.404-servicing.22569.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-ser... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74cf836b2..a4e0e740a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -40,13 +40,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 769fa0af3..41d6fd844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54b1902dd65349f55552c8af533293cd4ac4def9 + 5d5361de390b0298b583e37dc91e4e7462bd9b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54b1902dd65349f55552c8af533293cd4ac4def9 + 5d5361de390b0298b583e37dc91e4e7462bd9b26 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 54b1902dd65349f55552c8af533293cd4ac4def9 + 5d5361de390b0298b583e37dc91e4e7462bd9b26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 128990fc9e7041579b0acafb721b6f996f62e5c0 + 8079819072dc5e548ec11142b660908d28125a67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 128990fc9e7041579b0acafb721b6f996f62e5c0 + 8079819072dc5e548ec11142b660908d28125a67 diff --git a/eng/Versions.props b/eng/Versions.props index 67f308f8a..8ebafe121 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 0.2.0 - 6.0.404-servicing.22568.3 - 6.0.404-servicing.22568.3 + 6.0.404-servicing.22569.3 + 6.0.404-servicing.22569.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.12-servicing.22566.2 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 6.0.12 6.0.12 6.0.12 From d8baae5792c628492ba86bc6c51a3cbd2036d732 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Nov 2022 01:12:05 +0000 Subject: [PATCH 38/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221110.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22560.2 --- 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 3b934bddc..b737f2472 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 + 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 From eb6f31a22fe389a52116933558e7fb2bfdc2bd32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 01:12:06 +0000 Subject: [PATCH 39/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221110.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22560.2 --- 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 e10ce34fd..785371c43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37 + 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 From 73a3117d8dda6c461c4acafdef81334b28f4fafd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 02:53:05 +0000 Subject: [PATCH 40/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22570.2 --- 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 785371c43..890a79137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 + 38385bc8b19cebe7ae7d20771646158785ee5bdc From 8179bb6bb8d5add743c0406ab04ffcf6e6f9126b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Nov 2022 02:53:05 +0000 Subject: [PATCH 41/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221120.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22525.2 -> To Version 6.0.0-servicing.22570.2 --- 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 b737f2472..7d14babfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 701788259f5eba4eb8a9d1a0ee9e4ab6fa53c296 + 38385bc8b19cebe7ae7d20771646158785ee5bdc From 6d964d037cad4efb513a8abf35eb2ab5bf2a1582 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 22:08:31 +0000 Subject: [PATCH 42/78] Merged PR 27474: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.1-rtm.22559.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.1-rtm.22559.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22518.5 to 7.0.1-servicing.22568.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.FSharp.Compiler**: from 12.4.0-beta.22513.10 to 12.4.0-beta.22563.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22513.10 to 7.0.0-beta.22563.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.22471.3 to 7.0.100-1.22558.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-4.22520.11 to 4.4.0-6.22565.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.5 to 7.0.1-servicing.22568.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.M... --- NuGet.config | 9 ++ eng/Version.Details.xml | 114 +++++++++--------- eng/Versions.props | 44 +++---- .../tools/SourceBuildArcadeTarball.targets | 4 - .../tarball/content/Directory.Build.props | 17 --- .../tarball/content/repos/aspnetcore.proj | 1 + .../tarball/content/repos/installer.proj | 2 +- .../tarball/content/repos/known-good.proj | 1 - .../content/repos/package-source-build.proj | 2 +- .../content/repos/runtime-portable.proj | 47 -------- .../content/repos/runtime.common.props | 47 -------- .../content/repos/runtime.common.targets | 46 ------- .../tarball/content/repos/runtime.proj | 86 ++++++++++++- .../source-build-reference-packages.proj | 6 +- .../content/tools-local/init-build.proj | 12 ++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 3 + 17 files changed, 198 insertions(+), 245 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/repos/runtime-portable.proj delete mode 100644 src/SourceBuild/tarball/content/repos/runtime.common.props delete mode 100644 src/SourceBuild/tarball/content/repos/runtime.common.targets diff --git a/NuGet.config b/NuGet.config index 770df6dcb..05aa023ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -38,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb5497dc5..37fc4c693 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + d72289533a08a74449b918919b1f860dbb82a85d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + d72289533a08a74449b918919b1f860dbb82a85d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + d72289533a08a74449b918919b1f860dbb82a85d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + d72289533a08a74449b918919b1f860dbb82a85d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 97203d38ba734d76d39984c5206f2747f792fa89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 97203d38ba734d76d39984c5206f2747f792fa89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 97203d38ba734d76d39984c5206f2747f792fa89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 97203d38ba734d76d39984c5206f2747f792fa89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 97203d38ba734d76d39984c5206f2747f792fa89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 97203d38ba734d76d39984c5206f2747f792fa89 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + 432e6a061f28dda696ba16bc5442328d23b25d93 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + f6ee887211e0b6f83505a3dcb25c4925dbb8b696 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + f6ee887211e0b6f83505a3dcb25c4925dbb8b696 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + f6ee887211e0b6f83505a3dcb25c4925dbb8b696 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 882a576873b701f79d6584e4a0cf84036fdcd83f + f6ee887211e0b6f83505a3dcb25c4925dbb8b696 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - c370ee09c2eebcc750a59e9c10e52792679f896e + 51b87692496d1571d2aa56d4b5c836bfe06e60a1 - + https://github.com/dotnet/fsharp - c370ee09c2eebcc750a59e9c10e52792679f896e + 51b87692496d1571d2aa56d4b5c836bfe06e60a1 @@ -138,15 +138,15 @@ c02ece877c62577810f893c44279ce79af820112 - + https://github.com/dotnet/linker - 219e84c88def8276179f66282b2f7cb5f1d0d126 + 22376ee081ea791b4c8bfa82509f8e45af4bc629 linker - + https://github.com/dotnet/roslyn - 9e075f038a19d493244bc18997fc52a6c6eefa72 + 53091686b435746d62a5df56abfab0e71203d83a @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 73eb13444bdee019ec91191f96fd866661acbc78 - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 73eb13444bdee019ec91191f96fd866661acbc78 https://github.com/dotnet/deployment-tools @@ -186,6 +186,12 @@ 7b9791daa3a3477eb22ec805946c9fff8b42d8ca + + + https://github.com/dotnet/format + 6a22157622e5da71ba0c43d23269352210bdb277 + + diff --git a/eng/Versions.props b/eng/Versions.props index aabb8f052..e975fd38e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.1 + 7.0.1 + 7.0.1-servicing.22568.9 + 7.0.1-servicing.22568.9 + 7.0.1-servicing.22568.9 + 7.0.1-servicing.22568.9 + 7.0.1-servicing.22568.9 0.2.0 - 7.0.100 - 7.0.100-rtm.22521.7 - 7.0.100-rtm.22521.7 + 7.0.101 + 7.0.101-servicing.22569.6 + 7.0.101-servicing.22569.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.1-servicing.22568.4 + 7.0.1-servicing.22568.4 + 7.0.1 + 7.0.1 + 7.0.1 + 7.0.1 2.1.0 - 7.0.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.1-rtm.22559.2 + 7.0.1-rtm.22559.2 + 7.0.1 + 7.0.1 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.1 + 7.0.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index e7a9698c6..97f4b4ce3 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -285,10 +285,6 @@ - - diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index a0feed9d1..8880b5d05 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -23,19 +23,6 @@ x64 false - - false - - true - true - - - false - false - true - false @@ -236,12 +223,8 @@ - - - - diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index c11f22f5c..cea712c1b 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -9,6 +9,7 @@ $(BuildCommandArgs) --no-build-repo-tasks $(BuildCommandArgs) --no-build-nodejs $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) + $(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid) $(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index 4226bc62b..3a9756a27 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -30,7 +30,7 @@ $(BuildCommandArgs) /p:Rid=$(TargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - $(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(TargetRid) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 6f96a2fdf..0adee7f53 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -43,7 +43,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repos/package-source-build.proj index 0ada671fb..fbc5a0cc1 100644 --- a/src/SourceBuild/tarball/content/repos/package-source-build.proj +++ b/src/SourceBuild/tarball/content/repos/package-source-build.proj @@ -50,7 +50,7 @@ $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz - diff --git a/src/SourceBuild/tarball/content/repos/runtime-portable.proj b/src/SourceBuild/tarball/content/repos/runtime-portable.proj deleted file mode 100644 index 09b4625e9..000000000 --- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj +++ /dev/null @@ -1,47 +0,0 @@ - - - - - runtime - - - - - - - - - - - - - - - $(ProjectDirectory)artifacts/portableLog - $(ProjectDirectory)artifacts/portableObj - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props deleted file mode 100644 index cb02932f9..000000000 --- a/src/SourceBuild/tarball/content/repos/runtime.common.props +++ /dev/null @@ -1,47 +0,0 @@ - - - runtime - - - - - - - true - - - $(StandardSourceBuildArgs.Replace('-bl', '-nobl')) - - $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - $(ProjectDirectory)/clean$(ShellExtension) - - - - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - true - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets deleted file mode 100644 index 862b70dc8..000000000 --- a/src/SourceBuild/tarball/content/repos/runtime.common.targets +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - $(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json - - - - - - - - - <_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" /> - <_builtRuntimePackages> - $([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg')) - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj index 59ea1d6fc..85d0efa77 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.proj +++ b/src/SourceBuild/tarball/content/repos/runtime.proj @@ -1,18 +1,57 @@ - + + + true + + $(ProjectDirectory)/clean$(ShellExtension) + $(TargetRid) osx-x64 freebsd-x64 win-x64 + <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-')) + $(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex))) + + <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) + $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) + $(StandardSourceBuildArgs) $(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid) + $(BuildCommandArgs) /p:RuntimeOS=$(RuntimeOS) + $(BuildCommandArgs) /p:BaseOS=$(BaseOS) $(BuildCommandArgs) /p:SourceBuildNonPortable=true $(StandardSourceBuildCommand) $(BuildCommandArgs) + + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + true + + + + + + + + + + + + + + + + + + + + @@ -20,8 +59,49 @@ - - + + + + + + + + + + + + + $(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json + + + + + + + + + <_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" /> + <_builtRuntimePackages> + $([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg')) + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj index a4fb27340..c1321e716 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -4,7 +4,11 @@ $(BaseIntermediatePath)source-build-reference-package-cache - $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory) + $(StandardSourceBuildArgs) + $(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier) + $(BuildCommandArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory) + + $(StandardSourceBuildCommand) $(BuildCommandArgs) $(ProjectDirectory)NuGet.config $(ProjectDirectory)global.json diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index b2c3beed1..0405ad8f1 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + + + + + + microsoft.netcore.app.runtime.$(SharedFrameworkRid) - microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture) + microsoft.netcore.app.crossgen2.$(Crossgen2Rid) $(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index ae911ab1c..308fdfb2b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -84,6 +84,9 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + $(HostOSName)-$(BuildArchitecture) + $(SharedFrameworkRid) + $(SharedFrameworkRid) linux-x64 $(AspNetCoreInstallerRid) From 8cddaa7d01d3eca8fed169759661d7dbcc06fd7d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:19:42 +0000 Subject: [PATCH 43/78] Merged PR 27731: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22568.8 to 6.0.404-rtm.22571.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221121.18 - **Date Produced**: November 21, 2022 10:36:58 PM UTC - **Commit**: bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22569.3 to 6.0.404-servicing.22571.18][1] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22569.3 to 6.0.404-servicing.22571.18][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.404 to 6.0.404][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.404-rtm.22568.8 to 6.0.404-rtm.22571.13][3] - **Microsoft.DotNet.Com... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index a4e0e740a..efd7a806c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,13 +40,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d503389e4..28bc11c20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d5361de390b0298b583e37dc91e4e7462bd9b26 + 81a6b3990a59ea77eb4a13f65242dd166cf7a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d5361de390b0298b583e37dc91e4e7462bd9b26 + 81a6b3990a59ea77eb4a13f65242dd166cf7a23b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5d5361de390b0298b583e37dc91e4e7462bd9b26 + 81a6b3990a59ea77eb4a13f65242dd166cf7a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8079819072dc5e548ec11142b660908d28125a67 + bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8079819072dc5e548ec11142b660908d28125a67 + bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 diff --git a/eng/Versions.props b/eng/Versions.props index 8ebafe121..ddbacd946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.404-servicing.22569.3 - 6.0.404-servicing.22569.3 + 6.0.404-servicing.22571.18 + 6.0.404-servicing.22571.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9ce9473e125089aa10770b676d4a19bae4fa067 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:19:51 +0000 Subject: [PATCH 44/78] Merged PR 27732: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221121.17 - **Date Produced**: November 21, 2022 10:36:24 PM UTC - **Commit**: 923a0bd20698ff7e1109ee8f639240bc089d1ebc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12][3] ... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2164ea3b..24c5266f4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d14babfe..4265684a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc diff --git a/eng/Versions.props b/eng/Versions.props index 04f09e8d7..654cca3c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.307-servicing.22569.2 - 6.0.307-servicing.22569.2 + 6.0.307-servicing.22571.17 + 6.0.307-servicing.22571.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e54f57cd94036aa5cbd6272c330e9789b87c3d6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:17:08 +0000 Subject: [PATCH 45/78] Merged PR 27754: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.FSharp.Compiler**: from 12.4.0-beta.22563.2 to 12.4.0-beta.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22563.2 to 7.0.0-beta.22567.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221122.10 - **Date Produced**: November 22, 2022 5:42:46 PM UTC - **Commit**: 6ad1faf5090d47eb553c878be3a25610c26d8230 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22569.6 to 7.0.101-servicing.22572.10][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22569.6 to 7.0.101-servicing.22572.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22569.6 to 7.0.101-servicing.22572.10][1] - **Microsoft.FSharp.Compiler**: [from 12.4.0-beta.22563.2 to 12.4.0-beta.22567.3][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.0-beta.22563.2 to 7.0.0-beta.22567.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf6ee887&targetVersion=GC6ad1faf&_a=files [2]: https://github.com/dotnet/fsharp/compare/51b8769...3ff020f [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05aa023ff..a74e15b56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37fc4c693..0088671fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 51b87692496d1571d2aa56d4b5c836bfe06e60a1 + 3ff020ff25bac58a33ff65bd42d57ae2542fecd4 - + https://github.com/dotnet/fsharp - 51b87692496d1571d2aa56d4b5c836bfe06e60a1 + 3ff020ff25bac58a33ff65bd42d57ae2542fecd4 diff --git a/eng/Versions.props b/eng/Versions.props index e975fd38e..64a4c4c01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.101 - 7.0.101-servicing.22569.6 - 7.0.101-servicing.22569.6 + 7.0.101-servicing.22572.10 + 7.0.101-servicing.22572.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84a0f82424355693ce7c334f6ab34316a9aa6061 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:21:59 +0000 Subject: [PATCH 46/78] Merged PR 27753: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221122.12 - **Date Produced**: November 22, 2022 5:39:03 PM UTC - **Commit**: 1f6220ecb4f61ace28461f611ab1caeb618d2473 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22571.17 to 6.0.307-servicing.22572.12][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22571.17 to 6.0.307-servicing.22572.12][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC923a0bd&targetVersion=GC1f6220e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4437f08&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4265684a5..81d0b6937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 923a0bd20698ff7e1109ee8f639240bc089d1ebc + 1f6220ecb4f61ace28461f611ab1caeb618d2473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 923a0bd20698ff7e1109ee8f639240bc089d1ebc + 1f6220ecb4f61ace28461f611ab1caeb618d2473 diff --git a/eng/Versions.props b/eng/Versions.props index 654cca3c6..29f930960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22571.17 - 6.0.307-servicing.22571.17 + 6.0.307-servicing.22572.12 + 6.0.307-servicing.22572.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e998bcbeae74a596d217291407cca54724edd0d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 23:17:59 +0000 Subject: [PATCH 47/78] Merged PR 27765: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221122.23 - **Date Produced**: November 22, 2022 10:51:20 PM UTC - **Commit**: f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22571.18 to 6.0.404-servicing.22572.23][1] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22571.18 to 6.0.404-servicing.22572.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbd3ef45&targetVersion=GCf97d3fb&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCee26d5b&targetVersion=GCfb08461&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 2 ++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index efd7a806c..a930d5173 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28bc11c20..4301fa690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81a6b3990a59ea77eb4a13f65242dd166cf7a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 + f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bd3ef45d81cb82631d9349045fd5fab8c3b3a3f7 + f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 diff --git a/eng/Versions.props b/eng/Versions.props index ddbacd946..6b882a9af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.404-servicing.22571.18 - 6.0.404-servicing.22571.18 + 6.0.404-servicing.22572.23 + 6.0.404-servicing.22572.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.11-servicing.22523.3 - 6.0.11-servicing.22523.3 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22554.3 + 6.0.12-servicing.22554.3 + 6.0.12 + 6.0.12 From 55b7c993a198f292f8bfecec53248902fc53ec6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:25 +0000 Subject: [PATCH 48/78] Merged PR 27853: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221128.7 - **Date Produced**: November 28, 2022 11:33:02 PM UTC - **Commit**: 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5][3] - **Microsoft.... --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24c5266f4..1c6f27d32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,10 @@ - + - + @@ -41,15 +42,16 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81d0b6937..60d19a74a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f6220ecb4f61ace28461f611ab1caeb618d2473 + 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f6220ecb4f61ace28461f611ab1caeb618d2473 + 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 29f930960..27f4eb485 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22568.10 - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 @@ -56,8 +56,8 @@ - 6.0.307-servicing.22572.12 - 6.0.307-servicing.22572.12 + 6.0.307-servicing.22578.7 + 6.0.307-servicing.22578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.12-servicing.22554.3 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4 + 6.0.12-servicing.22578.4 6.0.12 6.0.12 From be4f3ec4116a6987a84aa7890f764e9c669157f5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:33 +0000 Subject: [PATCH 49/78] Merged PR 27854: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22571.13 to 6.0.404-rtm.22575.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221128.8 - **Date Produced**: November 28, 2022 11:33:35 PM UTC - **Commit**: 4b872018e4f78db68cdc8568b80999eb25b3d7c1 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22572.23 to 6.0.404-servicing.22578.8][1] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22572.23 to 6.0.404-servicing.22578.8][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.404 to 6.0.404][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.404-rtm.22571.13 to 6.0.404-rtm.22575.6][3] - **Microsoft.DotNet.Common.ProjectTem... --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index a930d5173..d6bbaa924 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,10 @@ - + - + @@ -41,16 +42,17 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4301fa690..7c41840e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81a6b3990a59ea77eb4a13f65242dd166cf7a23b + 87e5f0cad0ff547b1ca59c34119890a4ad68c2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81a6b3990a59ea77eb4a13f65242dd166cf7a23b + 87e5f0cad0ff547b1ca59c34119890a4ad68c2db https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81a6b3990a59ea77eb4a13f65242dd166cf7a23b + 87e5f0cad0ff547b1ca59c34119890a4ad68c2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 + 4b872018e4f78db68cdc8568b80999eb25b3d7c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1 + 4b872018e4f78db68cdc8568b80999eb25b3d7c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6b882a9af..3eb4349eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22568.10 - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 @@ -56,8 +56,8 @@ - 6.0.404-servicing.22572.23 - 6.0.404-servicing.22572.23 + 6.0.404-servicing.22578.8 + 6.0.404-servicing.22578.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.12-servicing.22554.3 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4 + 6.0.12-servicing.22578.4 6.0.12 6.0.12 From 0d6a8d85a10454785fdf8dade7227ad42071b704 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:58 +0000 Subject: [PATCH 50/78] Merged PR 27763: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221122.20 - **Date Produced**: November 22, 2022 10:19:36 PM UTC - **Commit**: da0196af6a8cd18cdb49c920194d18d4f5baa5e6 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22572.10 to 7.0.101-servicing.22572.20][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22572.10 to 7.0.101-servicing.22572.20][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22572.10 to 7.0.101-servicing.22572.20][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6ad1faf&targetVersion=GCda0196a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- 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 a74e15b56..d5dea8795 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0088671fa..fe9d1b7cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ad1faf5090d47eb553c878be3a25610c26d8230 + da0196af6a8cd18cdb49c920194d18d4f5baa5e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ad1faf5090d47eb553c878be3a25610c26d8230 + da0196af6a8cd18cdb49c920194d18d4f5baa5e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ad1faf5090d47eb553c878be3a25610c26d8230 + da0196af6a8cd18cdb49c920194d18d4f5baa5e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ad1faf5090d47eb553c878be3a25610c26d8230 + da0196af6a8cd18cdb49c920194d18d4f5baa5e6 diff --git a/eng/Versions.props b/eng/Versions.props index 64a4c4c01..08a598e82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.101 - 7.0.101-servicing.22572.10 - 7.0.101-servicing.22572.10 + 7.0.101-servicing.22572.20 + 7.0.101-servicing.22572.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2029e50ed7dc19c52994ffd161823879161d8e5a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 01:32:24 +0000 Subject: [PATCH 51/78] Merged PR 27856: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.1-rtm.22559.2 to 7.0.1-servicing.22578.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.1-rtm.22559.2 to 7.0.1-servicing.22578.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22518.7 to 7.0.1-servicing.22566.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22518.2 to 7.0.1-servicing.22567.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221128.10 - **Date Produced**: November 29, 2022 12:19:26 AM UTC - **Commit**: 91909352e17083f43ab3e6bf458bc172f111e273 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22572.20 to 7.0.101-servicing.22578.10][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22572.20 to 7.0.101-servicing.22578.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22572.20 to 7.0.101-servicing.22578.10][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.1 to 7.0.1][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.1-rtm.22559.2 to 7.0.1-servicing.22578.5][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.1-rtm.22559.2 to 7.0.1-servicing.22578.5][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.0-rtm.22518.7 to 7.0.1-servicing.22566.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.0-rtm.22518.2 to 7.0.1-servicing.22567.2][4] [1]: https://dev.azure.com/dnce... --- NuGet.config | 11 +++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5dea8795..947df0acb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,10 @@ + + @@ -18,10 +20,10 @@ - + - + @@ -43,15 +45,16 @@ + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe9d1b7cd..294cd90ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d72289533a08a74449b918919b1f860dbb82a85d + 0d6ee94e04df94a546ac952599a2e736294932b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d72289533a08a74449b918919b1f860dbb82a85d + 0d6ee94e04df94a546ac952599a2e736294932b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d72289533a08a74449b918919b1f860dbb82a85d + 0d6ee94e04df94a546ac952599a2e736294932b7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d72289533a08a74449b918919b1f860dbb82a85d + 0d6ee94e04df94a546ac952599a2e736294932b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da0196af6a8cd18cdb49c920194d18d4f5baa5e6 + 91909352e17083f43ab3e6bf458bc172f111e273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da0196af6a8cd18cdb49c920194d18d4f5baa5e6 + 91909352e17083f43ab3e6bf458bc172f111e273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da0196af6a8cd18cdb49c920194d18d4f5baa5e6 + 91909352e17083f43ab3e6bf458bc172f111e273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da0196af6a8cd18cdb49c920194d18d4f5baa5e6 + 91909352e17083f43ab3e6bf458bc172f111e273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + b32a0afc982d443052bd9c6bd4ebe6177575681c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + a6985a3e91f88860fd72ccc712c143b0a1dbd852 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 08a598e82..ee13033c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.1-servicing.22566.4 - 7.0.0-rtm.22518.2 + 7.0.1-servicing.22567.2 @@ -64,8 +64,8 @@ 7.0.101 - 7.0.101-servicing.22572.20 - 7.0.101-servicing.22572.20 + 7.0.101-servicing.22578.10 + 7.0.101-servicing.22578.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.1-rtm.22559.2 - 7.0.1-rtm.22559.2 + 7.0.1-servicing.22578.5 + 7.0.1-servicing.22578.5 7.0.1 7.0.1 From bb24aafa11a97992f917f021ffd783130fe12358 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 15:20:05 +0000 Subject: [PATCH 52/78] Merged PR 27866: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.1-servicing.22566.4 to 7.0.1-servicing.22568.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.1-servicing.22567.2 to 7.0.1-servicing.22569.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221129.2 - **Date Produced**: November 29, 2022 12:43:23 PM UTC - **Commit**: d29731999ae10550d0ee7100865cabe404af8195 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.1 to 7.0.1][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.1-servicing.22566.4 to 7.0.1-servicing.22568.11][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.1-servicing.22567.2 to 7.0.1-servicing.... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 947df0acb..7a3611109 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,10 +20,10 @@ - + - + @@ -51,10 +51,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 294cd90ab..9baab753d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0d6ee94e04df94a546ac952599a2e736294932b7 + 379885d35ea74fc97f382116b98f05bc5c5503b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0d6ee94e04df94a546ac952599a2e736294932b7 + 379885d35ea74fc97f382116b98f05bc5c5503b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0d6ee94e04df94a546ac952599a2e736294932b7 + 379885d35ea74fc97f382116b98f05bc5c5503b0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0d6ee94e04df94a546ac952599a2e736294932b7 + 379885d35ea74fc97f382116b98f05bc5c5503b0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91909352e17083f43ab3e6bf458bc172f111e273 + d29731999ae10550d0ee7100865cabe404af8195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91909352e17083f43ab3e6bf458bc172f111e273 + d29731999ae10550d0ee7100865cabe404af8195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91909352e17083f43ab3e6bf458bc172f111e273 + d29731999ae10550d0ee7100865cabe404af8195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91909352e17083f43ab3e6bf458bc172f111e273 + d29731999ae10550d0ee7100865cabe404af8195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b32a0afc982d443052bd9c6bd4ebe6177575681c + c09becd38536311776313f64bdc8f051c59de7a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a6985a3e91f88860fd72ccc712c143b0a1dbd852 + b824ea7e65424cd8b0121cc7d2dea88a4a2cb4aa https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ee13033c2..e1699b589 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.1-servicing.22566.4 + 7.0.1-servicing.22568.11 - 7.0.1-servicing.22567.2 + 7.0.1-servicing.22569.3 @@ -64,8 +64,8 @@ 7.0.101 - 7.0.101-servicing.22578.10 - 7.0.101-servicing.22578.10 + 7.0.101-servicing.22579.2 + 7.0.101-servicing.22579.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.1-servicing.22578.5 - 7.0.1-servicing.22578.5 + 7.0.1-servicing.22579.1 + 7.0.1-servicing.22579.1 7.0.1 7.0.1 From a01a61788b2d8f353e9952c67955deafda9a2dfc Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 29 Nov 2022 10:42:18 -0800 Subject: [PATCH 53/78] Update branding to 6.0.113 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 85d38fc12..53a13976d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 5621f190dcebd708fc0503b3836a6a0e49e1cba2 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 29 Nov 2022 10:42:23 -0800 Subject: [PATCH 54/78] Update branding to 6.0.308 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 681d9c657..e52d1d9fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 41303c7fc4487ddc71af40f919874ade2444942a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 29 Nov 2022 10:42:27 -0800 Subject: [PATCH 55/78] Update branding to 6.0.405 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a497d5519..0c81327de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 1674f77f14afcdb6488996baf6ca47ddcfe31f4e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 30 Nov 2022 06:57:17 -0800 Subject: [PATCH 56/78] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15058) * [release/6.0.1xx] Add CI for security-partners-dotnet (#14963) * Add CI for dotnet-security-partners * Remove nuget configs from all repo submodules * Address code review * Move security-partners ci to tarball/eng dir * Copy out installer NuGet config before build * Fix relative path for installer template * Update src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml Co-authored-by: Michael Simons * Revert "Remove nuget configs from all repo submodules" This reverts commit 87b8a2c523eb03a5d3eee1dcde3e01c15bddc3d2. Co-authored-by: Michael Simons * Update branding to 6.0.113 Co-authored-by: Logan Bussell Co-authored-by: Michael Simons Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Mitchell --- .../job/source-build-build-tarball.yml | 70 +++++++++++-------- .../pipelines/security-partners-dotnet.yml | 18 +++++ 2 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index ff035940f..b7318d262 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -43,7 +43,15 @@ jobs: - name: additionalBuildArgs value: --with-sdk /tarball/.dotnet - name: tarballDir - value: $(Build.StagingDirectory)/tarball + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) workspace: clean: all @@ -51,19 +59,28 @@ jobs: - checkout: self clean: true - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball - - download: ${{ parameters.installerBuildResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Source Tarball + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} @@ -84,20 +101,6 @@ jobs: Contents: '*.tar.gz' TargetFolder: $(tarballDir)/packages/archive/ - - script: | - set -x - - resourceIdPathSegment= - if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then - resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' - fi - - mkdir -p "$(tarballDir)" - tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" - eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" - eval rm -f "$tarballFilePath" - displayName: Extract Tarball - - script: | set -x @@ -135,13 +138,18 @@ jobs: docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) displayName: Build Tarball + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | set -x - # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - cp $(Build.SourcesDirectory)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config - dockerVolumeArgs="-v $(tarballDir):/tarball" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" poisonArg='' diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..f96c9fb37 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,18 @@ +trigger: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From 97dc64711fdd4ce09bdeb36b78b6bfd4c557d92b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 16:33:53 +0000 Subject: [PATCH 57/78] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221130.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22570.2 -> To Version 6.0.0-servicing.22580.2 --- 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 890a79137..c41c7c02f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 38385bc8b19cebe7ae7d20771646158785ee5bdc + a93f0b1b98f48057457f9532aa3d76f1565b5182 From 98712840e7b02488fab96d850bce683b55b27575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 10:33:48 +0000 Subject: [PATCH 58/78] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1c6f27d32..af69e5bbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -16,12 +20,20 @@ + + + + + + + + @@ -43,14 +55,26 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60d19a74a..c6e3fc6bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e + 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e + 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 diff --git a/eng/Versions.props b/eng/Versions.props index 42673d128..b409f7267 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.307-servicing.22578.7 - 6.0.307-servicing.22578.7 + 6.0.308-servicing.22580.32 + 6.0.308-servicing.22580.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e4e584bbad97007aa734608309d5441031b4537 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 13:31:18 +0000 Subject: [PATCH 59/78] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- 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 c6e3fc6bb..ed683d37b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 38385bc8b19cebe7ae7d20771646158785ee5bdc + a93f0b1b98f48057457f9532aa3d76f1565b5182 From 985447f2fe9f05c66b071db06b9af726ea83032f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 19:48:16 +0000 Subject: [PATCH 60/78] Merged PR 28024: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22575.5 to 6.0.308-servicing.22580.45 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft... --- NuGet.config | 42 ++++--------------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index af69e5bbf..3b1b4d2fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,33 +7,20 @@ - - - - - - + - - + - - - - - + - - - - + @@ -54,28 +41,15 @@ - - - - - - + - - + - - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed683d37b..389032ddb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 + e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91215e5f412ebab17a454bed0ad2b3ca9163a4c1 + e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + bd7407606f49c7bb9ee784c5a5a9c19127c0f081 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 9601ea7b0314d236be4e8dd482e0cc9222e95156 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b409f7267..b1256acd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22579.11 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22580.2 - 6.0.307 + 6.0.308 @@ -44,20 +44,20 @@ - 6.0.12 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 + 6.0.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 0.2.0 - 6.0.308-servicing.22580.32 - 6.0.308-servicing.22580.32 + 6.0.308-servicing.22601.16 + 6.0.308-servicing.22601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 + 6.0.13 + 6.0.13 2.1.0 - 6.0.12-servicing.22578.4 - 6.0.12-servicing.22578.4 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22601.1 + 6.0.13-servicing.22601.1 + 6.0.13 + 6.0.13 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.307 + 6.0.308 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7d8d71a2e95219ecd69ce3fbe6a271832cffd16f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 19:48:44 +0000 Subject: [PATCH 61/78] Merged PR 27923: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221201.10 - **Date Produced**: December 1, 2022 5:48:23 PM UTC - **Commit**: c1c65f7d7e470da27409a6b087d17aed0b64beeb - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b87201&targetVersion=GCc1c65f7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index d6bbaa924..1b291cc3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,10 @@ + + + + @@ -16,12 +20,20 @@ + + + + + + + + @@ -43,15 +55,27 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88492713..17e2ecf4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 87e5f0cad0ff547b1ca59c34119890a4ad68c2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b872018e4f78db68cdc8568b80999eb25b3d7c1 + c1c65f7d7e470da27409a6b087d17aed0b64beeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b872018e4f78db68cdc8568b80999eb25b3d7c1 + c1c65f7d7e470da27409a6b087d17aed0b64beeb diff --git a/eng/Versions.props b/eng/Versions.props index 54597e2b1..3ecb62d3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.404-servicing.22578.8 - 6.0.404-servicing.22578.8 + 6.0.405-servicing.22601.10 + 6.0.405-servicing.22601.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d803b53b60694749847f54406171ed9de4af1196 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 22:33:13 +0000 Subject: [PATCH 62/78] Merged PR 27907: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221201.26 - **Date Produced**: December 1, 2022 9:20:26 PM UTC - **Commit**: fe9d439d304289c2a82d5af52e57b941bdab3d0d - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.102][36] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22579.2 to 7.0.102-servicing.22601.26][36] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22579.2 to 7.0.102-servicing.22601.26][36] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22579.2 to 7.0.102-servicing.22601.26][36] - **Microsoft.NETCore.App.Ref**: [from 7.0.1 to 7.0.2][37] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.1-servicing.22568.4 to 7.0.2-servicing.22580.12][37] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.1 to 7.0.2][37] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.1 to 7.0.2][37] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.1 to 7.0.2][37] - **Microsoft.FSharp.Compiler**: [from 12.4.0-beta.22567.3 to 12.4.0-beta.22571.5][38] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.0-beta.22567.3 to 7.0.0-beta.22571.5][38] - **Microsoft.NET.ILLink.Tasks**: [from 7.0.100-1.22558.2 to 7.0.100-1.22579.2][39] - **Microsoft.Net.Compilers.Toolset**: [from 4.4.0-6.22565.8 to 4.4.0-6.22580.4][40] - **Microsoft.Build**: [from 17.4.0 to 17.4.1][41] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.1-servicing.22568.4 to 7.0.2-servicing.22580.12][37] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.1 to 7.0.2][42] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.1-servicing.22568.4 to 7.0.2-servicing.22580.12][37] - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: [from 7.0.1 to 7.0.2][42] [36]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd297319&targetVersion=GCfe9d439&_a=files [37]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC97203d3&targetVersion=GCb183393&_a=files [38]: https://github.com/dotnet/fsharp/compare/3ff020f...1d892dd [39]: https://github.com/dotnet/linker/compare/22376ee...8db10f4 [40]: https://github.com/dotnet/roslyn/compare/5309168...d7a6121 [41]: https://github.com/dotnet/msbuild/compare/18d5aef...9a89d02 [42]: https://github.com/dotnet/emsdk/compare/73eb134...d71ea7c [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build us... --- NuGet.config | 20 ++++++++---- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++------- 3 files changed, 59 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7a3611109..2be18c866 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,22 +8,26 @@ + + - - + + - + - + + + @@ -46,14 +50,18 @@ + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 560ae7459..77460a419 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 379885d35ea74fc97f382116b98f05bc5c5503b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97203d38ba734d76d39984c5206f2747f792fa89 + b183393058491bf0140928107de9ce814b69d53d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97203d38ba734d76d39984c5206f2747f792fa89 + b183393058491bf0140928107de9ce814b69d53d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97203d38ba734d76d39984c5206f2747f792fa89 + b183393058491bf0140928107de9ce814b69d53d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97203d38ba734d76d39984c5206f2747f792fa89 + b183393058491bf0140928107de9ce814b69d53d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97203d38ba734d76d39984c5206f2747f792fa89 + b183393058491bf0140928107de9ce814b69d53d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97203d38ba734d76d39984c5206f2747f792fa89 + b183393058491bf0140928107de9ce814b69d53d @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d29731999ae10550d0ee7100865cabe404af8195 + fe9d439d304289c2a82d5af52e57b941bdab3d0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d29731999ae10550d0ee7100865cabe404af8195 + fe9d439d304289c2a82d5af52e57b941bdab3d0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d29731999ae10550d0ee7100865cabe404af8195 + fe9d439d304289c2a82d5af52e57b941bdab3d0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d29731999ae10550d0ee7100865cabe404af8195 + fe9d439d304289c2a82d5af52e57b941bdab3d0d @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b824ea7e65424cd8b0121cc7d2dea88a4a2cb4aa - + https://github.com/dotnet/fsharp - 3ff020ff25bac58a33ff65bd42d57ae2542fecd4 + 1d892dd78d5dcb261a1d26f72efb333834436a02 - + https://github.com/dotnet/fsharp - 3ff020ff25bac58a33ff65bd42d57ae2542fecd4 + 1d892dd78d5dcb261a1d26f72efb333834436a02 @@ -138,20 +138,20 @@ c02ece877c62577810f893c44279ce79af820112 - + https://github.com/dotnet/linker - 22376ee081ea791b4c8bfa82509f8e45af4bc629 + 8db10f44053ed4cb95a99676ac7b8ccae681b79d linker - + https://github.com/dotnet/roslyn - 53091686b435746d62a5df56abfab0e71203d83a + d7a61210a88b584ca0827585ec6e871c6b1c5a14 - + https://github.com/dotnet/msbuild - 18d5aef85920037c9d6ff49b1215a4daf515197f + 9a89d02ff5de19d84190ebed4a6017df4dc19dc4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 73eb13444bdee019ec91191f96fd866661acbc78 + d71ea7cbed84152a921c7b7b4b4439c306bf9130 - + https://github.com/dotnet/emsdk - 73eb13444bdee019ec91191f96fd866661acbc78 + d71ea7cbed84152a921c7b7b4b4439c306bf9130 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 9fdf19b18..b83dc811d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.101 - 7.0.101-servicing.22579.2 - 7.0.101-servicing.22579.2 + 7.0.102 + 7.0.102-servicing.22601.26 + 7.0.102-servicing.22601.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,12 +76,12 @@ - 7.0.1-servicing.22568.4 - 7.0.1-servicing.22568.4 - 7.0.1 - 7.0.1 - 7.0.1 - 7.0.1 + 7.0.2-servicing.22580.12 + 7.0.2-servicing.22580.12 + 7.0.2 + 7.0.2 + 7.0.2 + 7.0.2 2.1.0 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.1 - 7.0.1 + 7.0.2 + 7.0.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From c61979521a4c6136fac9fa4d60f227c7971c6042 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 01:41:45 +0000 Subject: [PATCH 63/78] Merged PR 28083: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221201.36 - **Date Produced**: December 2, 2022 12:32:31 AM UTC - **Commit**: 873cc1a88b27554f9f12d378b91861fc4b82ee56 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1] - **Microsoft.NET.Sdk**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.13 to 6.0.13][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe6ee3f4&targetVersion=GC873cc1a&_a=files [2]: https://... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b1b4d2fb..f93da753d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 389032ddb..67f3f2b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4855a55ebcfe897e6cc339c62edc653e27258e8c + 397c48f9f7a86672e097f53155c255bc89068e8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 + 873cc1a88b27554f9f12d378b91861fc4b82ee56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 + 873cc1a88b27554f9f12d378b91861fc4b82ee56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd7407606f49c7bb9ee784c5a5a9c19127c0f081 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9601ea7b0314d236be4e8dd482e0cc9222e95156 + 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b1256acd9..9cf40a422 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22579.11 + 6.0.13-servicing.22601.1 - 6.0.13-servicing.22580.2 + 6.0.13-servicing.22601.5 @@ -56,8 +56,8 @@ - 6.0.308-servicing.22601.16 - 6.0.308-servicing.22601.16 + 6.0.308-servicing.22601.36 + 6.0.308-servicing.22601.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.13-servicing.22601.1 - 6.0.13-servicing.22601.1 + 6.0.13-servicing.22601.6 + 6.0.13-servicing.22601.6 6.0.13 6.0.13 From 27ab36058b70b2e05063911df631fbf17f954a35 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 15:20:32 +0000 Subject: [PATCH 64/78] Merged PR 28069: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22575.6 to 6.0.405-rtm.22580.43 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P... --- NuGet.config | 42 ++++--------------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 102 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b291cc3a..b1d3e88ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,33 +7,20 @@ - - - - - - + - - + - - - - - + - - - - + @@ -54,29 +41,16 @@ - - - - - - + - - + - - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17e2ecf4c..4c57d7b37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 87e5f0cad0ff547b1ca59c34119890a4ad68c2db + bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 87e5f0cad0ff547b1ca59c34119890a4ad68c2db + bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 87e5f0cad0ff547b1ca59c34119890a4ad68c2db + bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1c65f7d7e470da27409a6b087d17aed0b64beeb + 0a587d5a182150fbefff03d839f383cf68ff0243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c1c65f7d7e470da27409a6b087d17aed0b64beeb + 0a587d5a182150fbefff03d839f383cf68ff0243 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3ecb62d3c..6c8d84260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22601.1 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22601.5 - 6.0.404 + 6.0.405 @@ -44,20 +44,20 @@ - 6.0.12 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 + 6.0.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 0.2.0 - 6.0.405-servicing.22601.10 - 6.0.405-servicing.22601.10 + 6.0.405-servicing.22601.33 + 6.0.405-servicing.22601.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 + 6.0.13 + 6.0.13 2.1.0 - 6.0.12-servicing.22578.4 - 6.0.12-servicing.22578.4 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22601.6 + 6.0.13-servicing.22601.6 + 6.0.13 + 6.0.13 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.404 + 6.0.405 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 18615b1f455c48170c27a5e6dc9991d4ac960e94 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 15:21:09 +0000 Subject: [PATCH 65/78] Merged PR 28079: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.1-servicing.22579.1 to 7.0.2-servicing.22601.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.1-servicing.22579.1 to 7.0.2-servicing.22601.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.1-servicing.22568.9 to 7.0.2-servicing.22580.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.1-servicing.22568.9 to 7.0.2-servicing.22580.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.1-servicing.22568.9 to 7.0.2-servicing.22580.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.1-servicing.22568.9 to 7.0.2-servicing.22580.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.1-servicing.22568.9 to 7.0.2-servicing.22580.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.1-servicing.22568.11 to 7.0.2-servicing.22601.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.1-servicing.22569.3 to 7.0.2-servicing.22601.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221201.34 - **Date Produced**: December 1, 2022 11:31:02 PM UTC - **Commit**: b988e5110fd1f32d454f83ba4feffcacf30fe8a9 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.102 to 7.0.102][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.102-servicing.22601.26 to 7.0.102-servicing.22601.34][1] - **Microsoft.NET.Sdk**: [from 7.0.102-servicing.22601.26 to 7.0.102-servicing.226... --- NuGet.config | 22 ++++---------- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 54 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2be18c866..52c7f49d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -22,12 +19,10 @@ - + - - - + @@ -49,20 +44,15 @@ - - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77460a419..4fc2bc116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 379885d35ea74fc97f382116b98f05bc5c5503b0 + 44aec6b7b3cb8f9da36688105159af845cd85f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 379885d35ea74fc97f382116b98f05bc5c5503b0 + 44aec6b7b3cb8f9da36688105159af845cd85f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 379885d35ea74fc97f382116b98f05bc5c5503b0 + 44aec6b7b3cb8f9da36688105159af845cd85f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 379885d35ea74fc97f382116b98f05bc5c5503b0 + 44aec6b7b3cb8f9da36688105159af845cd85f20 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 432e6a061f28dda696ba16bc5442328d23b25d93 + 51612364b741a09dab2207c036224c98e7505176 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe9d439d304289c2a82d5af52e57b941bdab3d0d + b988e5110fd1f32d454f83ba4feffcacf30fe8a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe9d439d304289c2a82d5af52e57b941bdab3d0d + b988e5110fd1f32d454f83ba4feffcacf30fe8a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe9d439d304289c2a82d5af52e57b941bdab3d0d + b988e5110fd1f32d454f83ba4feffcacf30fe8a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe9d439d304289c2a82d5af52e57b941bdab3d0d + b988e5110fd1f32d454f83ba4feffcacf30fe8a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c09becd38536311776313f64bdc8f051c59de7a3 + 0b72a8d9b5eea6a6528da3037108626664da2fdd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b824ea7e65424cd8b0121cc7d2dea88a4a2cb4aa + 7d3c040a09d0a9a7434c291e353df73b7bb0ef37 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b83dc811d..e401f2a75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.1-servicing.22568.11 + 7.0.2-servicing.22601.2 - 7.0.1-servicing.22569.3 + 7.0.2-servicing.22601.4 @@ -50,13 +50,13 @@ - 7.0.1 - 7.0.1 - 7.0.1-servicing.22568.9 - 7.0.1-servicing.22568.9 - 7.0.1-servicing.22568.9 - 7.0.1-servicing.22568.9 - 7.0.1-servicing.22568.9 + 7.0.2 + 7.0.2 + 7.0.2-servicing.22580.16 + 7.0.2-servicing.22580.16 + 7.0.2-servicing.22580.16 + 7.0.2-servicing.22580.16 + 7.0.2-servicing.22580.16 0.2.0 @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22601.26 - 7.0.102-servicing.22601.26 + 7.0.102-servicing.22601.34 + 7.0.102-servicing.22601.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,10 +86,10 @@ - 7.0.1-servicing.22579.1 - 7.0.1-servicing.22579.1 - 7.0.1 - 7.0.1 + 7.0.2-servicing.22601.5 + 7.0.2-servicing.22601.5 + 7.0.2 + 7.0.2 From 868e09233fccaee54c820da73dca4c1d426fff30 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 19:02:44 +0000 Subject: [PATCH 66/78] Merged PR 28102: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221202.4 - **Date Produced**: December 2, 2022 5:10:38 PM UTC - **Commit**: 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.102 to 7.0.102][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.102-servicing.22601.34 to 7.0.102-servicing.22602.4][1] - **Microsoft.NET.Sdk**: [from 7.0.102-servicing.22601.34 to 7.0.102-servicing.22602.4][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.102-servicing.22601.34 to 7.0.102-servicing.22602.4][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.2 to 7.0.2][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.2 to 7.0.2][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8][2] - **dotnet-dev-certs**: [from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8][2] - **dotnet-user-jwts**: [from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8][2] - **dotnet-user-secrets**: [from 7.0.2-servicing.22580.16 to 7.0.2-servicing.22601.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb988e51&targetVersion=GC75b9fd6&_a=files [2]: https://dev.azure.com/dnceng/int... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 52c7f49d5..564ff42e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fc2bc116..d18c8465f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 51612364b741a09dab2207c036224c98e7505176 + da13e9c5156ab1955e8364f26f2d1f3abb245bed https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b988e5110fd1f32d454f83ba4feffcacf30fe8a9 + 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b988e5110fd1f32d454f83ba4feffcacf30fe8a9 + 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b988e5110fd1f32d454f83ba4feffcacf30fe8a9 + 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b988e5110fd1f32d454f83ba4feffcacf30fe8a9 + 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 diff --git a/eng/Versions.props b/eng/Versions.props index e401f2a75..c72ddbd6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.2 7.0.2 - 7.0.2-servicing.22580.16 - 7.0.2-servicing.22580.16 - 7.0.2-servicing.22580.16 - 7.0.2-servicing.22580.16 - 7.0.2-servicing.22580.16 + 7.0.2-servicing.22601.8 + 7.0.2-servicing.22601.8 + 7.0.2-servicing.22601.8 + 7.0.2-servicing.22601.8 + 7.0.2-servicing.22601.8 0.2.0 @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22601.34 - 7.0.102-servicing.22601.34 + 7.0.102-servicing.22602.4 + 7.0.102-servicing.22602.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 390818fd3efa2316e1d494578d5ea9a4665f8cbc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 7 Dec 2022 06:07:41 +0000 Subject: [PATCH 67/78] Merged PR 28256: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.2-servicing.22580.12 to 7.0.2-servicing.22606.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.2-servicing.22580.12 to 7.0.2-servicing.22606.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.2-servicing.22580.12 to 7.0.2-servicing.22606.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221206.15 - **Date Produced**: December 7, 2022 4:53:51 AM UTC - **Commit**: add220db52958d9da088543f9cdf121aa9116f9a - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.102 to 7.0.102][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.102-servicing.22602.4 to 7.0.102-servicing.22606.15][1] - **Microsoft.NET.Sdk**: [from 7.0.102-servicing.22602.4 to 7.0.102-servicing.22606.15][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.102-servicing.22602.4 to 7.0.102-servicing.22606.15][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.2 to 7.0.2][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.2-servicing.22580.12 to 7.0.2-servicing.22606.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.2 to 7.0.2][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.2 to 7.0.2][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.2 to 7.0.2][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22580.12 to 7.0.2-servicing.22606.5][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22580.12 to 7.0.2-servicing.22606.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC75b9fd6&targetVersion=GCadd220d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/do... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 564ff42e1..c23041c1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,24 @@ + + - + - + + @@ -44,14 +47,16 @@ + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d18c8465f..b5e5e6fdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 44aec6b7b3cb8f9da36688105159af845cd85f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b183393058491bf0140928107de9ce814b69d53d + d037e070ebe5c83838443f869d5800752b0fcb13 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b183393058491bf0140928107de9ce814b69d53d + d037e070ebe5c83838443f869d5800752b0fcb13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b183393058491bf0140928107de9ce814b69d53d + d037e070ebe5c83838443f869d5800752b0fcb13 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b183393058491bf0140928107de9ce814b69d53d + d037e070ebe5c83838443f869d5800752b0fcb13 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b183393058491bf0140928107de9ce814b69d53d + d037e070ebe5c83838443f869d5800752b0fcb13 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b183393058491bf0140928107de9ce814b69d53d + d037e070ebe5c83838443f869d5800752b0fcb13 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 + add220db52958d9da088543f9cdf121aa9116f9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 + add220db52958d9da088543f9cdf121aa9116f9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 + add220db52958d9da088543f9cdf121aa9116f9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75b9fd6489fa8ae75fd1e90ac7817ef4f1969d48 + add220db52958d9da088543f9cdf121aa9116f9a diff --git a/eng/Versions.props b/eng/Versions.props index c72ddbd6a..93ab59dfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22602.4 - 7.0.102-servicing.22602.4 + 7.0.102-servicing.22606.15 + 7.0.102-servicing.22606.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.2-servicing.22580.12 - 7.0.2-servicing.22580.12 + 7.0.2-servicing.22606.5 + 7.0.2-servicing.22606.5 7.0.2 7.0.2 7.0.2 From 4bbdd14480a177e60fba52abf34829020449e46e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 7 Dec 2022 13:33:06 +0000 Subject: [PATCH 68/78] Merged PR 28258: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.2-servicing.22601.2 to 7.0.2-servicing.22606.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.2-servicing.22601.4 to 7.0.2-servicing.22606.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221207.4 - **Date Produced**: December 7, 2022 11:26:11 AM UTC - **Commit**: 98720693e228934405de152651b2e21390c3bfec - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.102 to 7.0.102][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.102-servicing.22606.15 to 7.0.102-servicing.22607.4][3] - **Microsoft.NET.Sdk**: [from 7.0.102-servicing.22606.15 to 7.0.102-servicing.22607.4][... --- NuGet.config | 16 +++++------- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c23041c1f..8ca01d0f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -21,11 +20,10 @@ - + - - + @@ -47,17 +45,15 @@ - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5e5e6fdd..bfaed85d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b72a8d9b5eea6a6528da3037108626664da2fdd + 8b06c27c9b81f33e69f8d5155fe69693f661fa3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7d3c040a09d0a9a7434c291e353df73b7bb0ef37 + df04c57b2e2bb986f0afc2384cbebb3c950447b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 93ab59dfa..fa81db344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.2-servicing.22601.2 + 7.0.2-servicing.22606.8 - 7.0.2-servicing.22601.4 + 7.0.2-servicing.22606.2 @@ -52,11 +52,11 @@ 7.0.2 7.0.2 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 0.2.0 @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22606.15 - 7.0.102-servicing.22606.15 + 7.0.102-servicing.22607.4 + 7.0.102-servicing.22607.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.2-servicing.22601.5 - 7.0.2-servicing.22601.5 + 7.0.2-servicing.22607.1 + 7.0.2-servicing.22607.1 7.0.2 7.0.2 From 5174d50e4e2d7d5fa16ce2e827495f8fc5afe924 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Mon, 19 Dec 2022 17:20:19 -0800 Subject: [PATCH 69/78] .NET Source-Build 6.0.112 December 2022 Updates (#15127) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 53a13976d..95d716c41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.111 + 6.0.112 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index d211a6fa7..37a961c91 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111" + "dotnet": "6.0.112" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b36e17c794727f7f4c7967cb838829cd32d03665 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:47 -0800 Subject: [PATCH 70/78] Update branding to 6.0.309 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e52d1d9fb..92d590df3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b9ce8d03de751da2cedf8bda4cb0575e100b6db9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:52 -0800 Subject: [PATCH 71/78] Update branding to 6.0.406 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0c81327de..25aa43a71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From fb4333e3fdad6812f55962f37e0aa8d5d7571ae7 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:57 -0800 Subject: [PATCH 72/78] Update branding to 7.0.103 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 428ceb7a8..9e9510ea6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 9cd784cdbfc6977537ec6d87945abf92c8745c10 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 14:11:27 -0800 Subject: [PATCH 73/78] [7.0.1xx] Update Asp.Net templates --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9e9510ea6..a4bdba56c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.11 + 6.0.13 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -150,7 +150,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From ba627450f80475451a3527f2e144f1b8915989db Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:42:58 -0800 Subject: [PATCH 74/78] [6.0.3xx] Update Asp.Net templates (#15246) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b8fdf8c58..89924f3e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From 7c2e144469172bb874ccdaedfe59cbcc3b7c6d79 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:43:16 -0800 Subject: [PATCH 75/78] [6.0.4xx] Update asp.net templates (#15244) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3ad91b798..de00f2ace 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From e348545cae52e80f4ff33b25545e93cfbdbdc5fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 19:23:37 +0000 Subject: [PATCH 76/78] Update dependencies from https://github.com/dotnet/arcade build 20230110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22561.2 -> To Version 7.0.0-beta.23060.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/sdk-task.ps1 | 2 +- eng/common/sdl/sdl.ps1 | 1 - eng/common/templates/steps/source-build.yml | 6 ++++++ eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 2 +- global.json | 6 +++--- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccfe9c59e..9ef109d57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + ac5977ebf05451c1adcf24a15d16263e4d25fd0c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9e9510ea6..0ec700f82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22561.2 + 7.0.0-beta.23060.4 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 561576be9..964610524 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 39be08d4b..e10a59687 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 648c5068d..ac196e164 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -1,7 +1,6 @@ function Install-Gdn { param( - [Parameter(Mandatory=$true)] [string]$Path, # If omitted, install the latest version of Guardian, otherwise install that specific version. diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 12a8ff94d..4624885e3 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 449126943..021555cf3 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview - $defaultXCopyMSBuildVersion = '17.3.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview + $defaultXCopyMSBuildVersion = '17.4.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c110d0ed4..e9a7ed9af 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then - if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then + if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then global_json_has_runtimes=true fi elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then diff --git a/global.json b/global.json index 7cd0b9917..c4142c606 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100", + "dotnet": "7.0.102", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22561.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" } } From c66a9c449687287f51456924cfe4a660b6b016dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 22:22:05 +0000 Subject: [PATCH 77/78] [release/6.0.4xx] Update dependencies from dotnet/arcade (#15261) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 10 ++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 6 +++--- 6 files changed, 31 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1d3e88ec..8d7143758 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -18,9 +17,13 @@ + + + + @@ -41,15 +44,18 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c57d7b37..2a54de844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index de00f2ace..dfc5106e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22561.1 + 6.0.0-beta.23060.6 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb0..51f30e53d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcd..b5b3e5aeb 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 30864f9a7..50c158ed8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111", + "dotnet": "6.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" } } From 269f3acab7b406bdffba963ff0ec1c30e8bb6020 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 13 Jan 2023 15:14:29 +0000 Subject: [PATCH 78/78] Remove obsolete source-build format patch --- ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch deleted file mode 100644 index e8b8f38fd..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 15 Nov 2022 17:34:00 +0000 -Subject: [PATCH] Address Microsoft.Build.Locator prebuilt - -Backport: https://github.com/dotnet/format/issues/1759 ---- - Directory.Packages.props | 2 +- - eng/Versions.props | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c4bf3cf..f7e85b2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -10,7 +10,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index fcd583b..2933963 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -14,6 +14,7 @@ - - - 17.3.0-preview-22302-02 -+ 1.5.5 - 3.3.3 - 7.0.0-rc.1.22426.10 -