From df13328c596dcea58f21f8625d2e848995431e71 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Aug 2022 16:41:17 -0700 Subject: [PATCH 01/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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 6d7d4ef5f30c188ab373630979d446528fecdde1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 26 Oct 2022 05:01:22 +0000 Subject: [PATCH 14/25] 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 28c8bf2dfc29e91d4a4f43bce544c6ac6e26de2c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 19 Nov 2022 15:41:05 +0000 Subject: [PATCH 15/25] 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 6d964d037cad4efb513a8abf35eb2ab5bf2a1582 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 22:08:31 +0000 Subject: [PATCH 16/25] 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 e54f57cd94036aa5cbd6272c330e9789b87c3d6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:17:08 +0000 Subject: [PATCH 17/25] 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 0d6a8d85a10454785fdf8dade7227ad42071b704 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:58 +0000 Subject: [PATCH 18/25] 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 19/25] 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 20/25] 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 d803b53b60694749847f54406171ed9de4af1196 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 22:33:13 +0000 Subject: [PATCH 21/25] 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 18615b1f455c48170c27a5e6dc9991d4ac960e94 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 15:21:09 +0000 Subject: [PATCH 22/25] 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 23/25] 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 24/25] 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 25/25] 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