From cebd153a5aa5e4a710c2cf36cf08fe7ee746892f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Oct 2022 17:17:48 +0000 Subject: [PATCH 01/70] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++--- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 73 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63e561aa8..4cc54261c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ + - - - - - - + + + @@ -43,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12d34ade0..045781d85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + b786d2bbcc15b6841d407b3fb028d0006faa094b https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 + ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 + ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 + ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a886cd6214c92f6a5d955c056014820c35591e7b + 27dfdd91b088b5a7e286f95db6b9b2d23585107a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a886cd6214c92f6a5d955c056014820c35591e7b + 27dfdd91b088b5a7e286f95db6b9b2d23585107a diff --git a/eng/Versions.props b/eng/Versions.props index f1b28ff88..acec2a7bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.110 + 6.0.111 @@ -44,44 +44,44 @@ - 6.0.10 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 + 6.0.11 + 6.0.11 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 + 6.0.11-servicing.22511.16 0.2.0 - 6.0.110-servicing.22476.46 - 6.0.110-servicing.22476.46 + 6.0.111-servicing.22517.6 + 6.0.111-servicing.22517.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.6 + 6.0.7 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22514.6 + 6.0.11-servicing.22514.6 + 6.0.11 + 6.0.11 + 6.0.11 + 6.0.11 2.1.0 - 6.0.10-servicing.22476.6 - 6.0.10-servicing.22476.6 - 6.0.10 - 6.0.10 + 6.0.11-servicing.22513.9 + 6.0.11-servicing.22513.9 + 6.0.11 + 6.0.11 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.110 + 6.0.111 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1d431b292fd554900678e90096fd9eab34f72e5c Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 17 Oct 2022 22:16:46 +0000 Subject: [PATCH 02/70] Update source-build CI to not arm64 leg on internal PRs --- .../job/source-build-run-tarball-build.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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 471f00e27..59982eb2b 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 @@ -78,22 +78,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') }}: - Debian9-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.debian9Arm64Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false + Debian9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian9Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} From b02da18b8fb3e8fecbc804adb21ceab2067b8649 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 18 Oct 2022 01:20:13 +0000 Subject: [PATCH 03/70] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4cc54261c..43a86b49e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 045781d85..7177b1c66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27dfdd91b088b5a7e286f95db6b9b2d23585107a + d4e90ae3fc1170516810b18728bb62a0d334a6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27dfdd91b088b5a7e286f95db6b9b2d23585107a + d4e90ae3fc1170516810b18728bb62a0d334a6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 8d60cc76ff0cd2bc37b145dcb5bff097f990844f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index acec2a7bc..e5a42d7cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22513.6 - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22517.1 @@ -56,8 +56,8 @@ - 6.0.111-servicing.22517.6 - 6.0.111-servicing.22517.6 + 6.0.111-servicing.22517.23 + 6.0.111-servicing.22517.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22513.9 - 6.0.11-servicing.22513.9 + 6.0.11-servicing.22517.3 + 6.0.11-servicing.22517.3 6.0.11 6.0.11 From 9c193d440c03bdd0f3d84551335a06481f1d082f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 18 Oct 2022 20:39:26 +0000 Subject: [PATCH 04/70] Merged PR 26839: Ignore EOL warning for net5.0 in F#. Ignore EOL warning for net5.0 in F#. --- src/SourceBuild/tarball/content/repos/fsharp.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index a03a69fc5..2e6190424 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -10,6 +10,7 @@ custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice. --> $(BuildCommandArgs) --sourcebuild + $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false From 9c84ca5a861e450a1074b4c0126541959ece7760 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 21:40:10 +0000 Subject: [PATCH 05/70] Merged PR 26844: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.3 - **Date Produced**: October 18, 2022 5:40:56 PM UTC - **Commit**: 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd4e90ae&targetVersion=GC1b66d2b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43a86b49e..2eff689cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7177b1c66..12e56e7db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b786d2bbcc15b6841d407b3fb028d0006faa094b + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d4e90ae3fc1170516810b18728bb62a0d334a6bc + 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d4e90ae3fc1170516810b18728bb62a0d334a6bc + 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 diff --git a/eng/Versions.props b/eng/Versions.props index e5a42d7cc..d8f9c3376 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 - 6.0.11-servicing.22511.16 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 0.2.0 - 6.0.111-servicing.22517.23 - 6.0.111-servicing.22517.23 + 6.0.111-servicing.22518.3 + 6.0.111-servicing.22518.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3dc79dc1bf8b22d6d3f0894dde44bf35f67f137 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 04:16:49 +0000 Subject: [PATCH 06/70] Merged PR 26849: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.14 - **Date Produced**: October 19, 2022 12:13:28 AM UTC - **Commit**: f364505f98c1a6266cc3209616396c35f079e122 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1b66d2b&targetVersion=GCf364505&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7b9c4cb&targetVersion=GCd43b60f&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7a706b&targetVersion=GC1821cb5&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC8d60cc7&targetVersion=GC4e1581e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.Projec... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2eff689cc..6edab0b41 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12e56e7db..f8294ad30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 + f364505f98c1a6266cc3209616396c35f079e122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1 + f364505f98c1a6266cc3209616396c35f079e122 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8d60cc76ff0cd2bc37b145dcb5bff097f990844f + 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d8f9c3376..139fc1f7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22513.6 + 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.1 + 6.0.11-servicing.22517.6 @@ -56,8 +56,8 @@ - 6.0.111-servicing.22518.3 - 6.0.111-servicing.22518.3 + 6.0.111-servicing.22518.14 + 6.0.111-servicing.22518.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22517.3 - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22518.2 + 6.0.11-servicing.22518.2 6.0.11 6.0.11 From 62d04c80340371f7135cd2128a0e61e449bf8e66 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:36:30 +0000 Subject: [PATCH 07/70] Merged PR 26877: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221018.25 - **Date Produced**: October 19, 2022 4:49:17 AM UTC - **Commit**: d2aa8e2e7c433a280775f3ab9845f5e602fb5537 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf364505&targetVersion=GCd2aa8e2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc672e90&targetVersion=GCaf5b37c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6edab0b41..f3cf6c85f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8294ad30..4cdbb893b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ae281afa07344191bc212270148f881726d2534d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f364505f98c1a6266cc3209616396c35f079e122 + d2aa8e2e7c433a280775f3ab9845f5e602fb5537 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f364505f98c1a6266cc3209616396c35f079e122 + d2aa8e2e7c433a280775f3ab9845f5e602fb5537 diff --git a/eng/Versions.props b/eng/Versions.props index 139fc1f7f..2bd45e6da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.111-servicing.22518.14 - 6.0.111-servicing.22518.14 + 6.0.111-servicing.22518.25 + 6.0.111-servicing.22518.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22514.6 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 + 6.0.11-servicing.22518.9 6.0.11 6.0.11 6.0.11 From 4e279f42cc9fa5dd25a18a1a511648f6d0425153 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:32:38 +0000 Subject: [PATCH 08/70] Merged PR 26888: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221019.5 - **Date Produced**: October 19, 2022 3:05:49 PM UTC - **Commit**: eea343b1bcf8392e2ddead88bafe9e9f18105cc2 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6][3] ... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3cf6c85f..5ea071197 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cdbb893b..49f7cf03b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ae281afa07344191bc212270148f881726d2534d + 5f17eae8fa21ff887ba04f39925fc1b986799145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ae281afa07344191bc212270148f881726d2534d + 5f17eae8fa21ff887ba04f39925fc1b986799145 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ae281afa07344191bc212270148f881726d2534d + 5f17eae8fa21ff887ba04f39925fc1b986799145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2aa8e2e7c433a280775f3ab9845f5e602fb5537 + eea343b1bcf8392e2ddead88bafe9e9f18105cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2aa8e2e7c433a280775f3ab9845f5e602fb5537 + eea343b1bcf8392e2ddead88bafe9e9f18105cc2 diff --git a/eng/Versions.props b/eng/Versions.props index 2bd45e6da..d6a6e7b96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 0.2.0 - 6.0.111-servicing.22518.25 - 6.0.111-servicing.22518.25 + 6.0.111-servicing.22519.5 + 6.0.111-servicing.22519.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3e05cc2cd01b8ecfaccaeb24f64978ac7a914898 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 19:45:10 +0000 Subject: [PATCH 09/70] Merged PR 26911: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221019.20 - **Date Produced**: October 19, 2022 6:59:59 PM UTC - **Commit**: c287c60f01cd4abc3efecfd992d2b8a227783900 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCeea343b&targetVersion=GCc287c60&_a=files [2]: https://dev.a... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ea071197..c1edef187 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49f7cf03b..e0dd845b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5f17eae8fa21ff887ba04f39925fc1b986799145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eea343b1bcf8392e2ddead88bafe9e9f18105cc2 + c287c60f01cd4abc3efecfd992d2b8a227783900 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eea343b1bcf8392e2ddead88bafe9e9f18105cc2 + c287c60f01cd4abc3efecfd992d2b8a227783900 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 + 37deaa02f76fc3b8df620e305b450b06fe2b685d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d6a6e7b96..6883519f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22519.5 - 6.0.11-servicing.22517.6 + 6.0.11-servicing.22519.2 @@ -56,8 +56,8 @@ - 6.0.111-servicing.22519.5 - 6.0.111-servicing.22519.5 + 6.0.111-servicing.22519.20 + 6.0.111-servicing.22519.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22518.2 - 6.0.11-servicing.22518.2 + 6.0.11-servicing.22519.3 + 6.0.11-servicing.22519.3 6.0.11 6.0.11 From 967e79ec91a09aeb958f4d30b710a90240a9a1ae Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 20 Oct 2022 22:14:54 +0000 Subject: [PATCH 10/70] Merged PR 26947: Also set CheckEolTargetFramework=false in F# bootstrap build. F# bootstrap build also needs this argument. --- src/SourceBuild/tarball/content/repos/fsharp.proj | 2 +- ...-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/SourceBuild/tarball/patches/fsharp/{0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch => 0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch} (100%) diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 2e6190424..4d00be9ad 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -10,7 +10,6 @@ custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice. --> $(BuildCommandArgs) --sourcebuild - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false @@ -28,6 +27,7 @@ + diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch similarity index 100% rename from src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch rename to src/SourceBuild/tarball/patches/fsharp/0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch From 528fc999da4931d6d5366e34200b7da506122b22 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:00 +0000 Subject: [PATCH 11/70] Merged PR 26995: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.10 to 6.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221023.4 - **Date Produced**: October 23, 2022 10:44:47 PM UTC - **Commit**: 4c81383014030abdada230e871efd72be72ea5cb - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.10 to 6.0.11][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc287c60&targetVersion=GC4c81383&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targ... --- NuGet.config | 15 +++++++++++++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index c1edef187..4a3f4557f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,25 @@ + + + - + + + + @@ -41,14 +47,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0dd845b2..50ed2f98e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5f17eae8fa21ff887ba04f39925fc1b986799145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c287c60f01cd4abc3efecfd992d2b8a227783900 + 4c81383014030abdada230e871efd72be72ea5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c287c60f01cd4abc3efecfd992d2b8a227783900 + 4c81383014030abdada230e871efd72be72ea5cb @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - c3fc739ca5a38641fe021f94c3986465296c71e0 + 374833d8416df22155bc0509559352af65bd8266 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 6883519f5..8e18456f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.111-servicing.22519.20 - 6.0.111-servicing.22519.20 + 6.0.111-servicing.22523.4 + 6.0.111-servicing.22523.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.11-servicing.22518.9 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 6.0.11 6.0.11 6.0.11 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.10 + 6.0.11 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 0a99058217c6777758aa8709cfb30eb141db1c2c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 03:58:12 +0000 Subject: [PATCH 12/70] Merged PR 27003: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221023.14 - **Date Produced**: October 24, 2022 3:26:12 AM UTC - **Commit**: ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4][3] - **... --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a3f4557f..ed082d288 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -20,9 +18,7 @@ - - - + @@ -47,16 +43,12 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50ed2f98e..1ae752fa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5f17eae8fa21ff887ba04f39925fc1b986799145 + 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5f17eae8fa21ff887ba04f39925fc1b986799145 + 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5f17eae8fa21ff887ba04f39925fc1b986799145 + 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c81383014030abdada230e871efd72be72ea5cb + ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c81383014030abdada230e871efd72be72ea5cb + ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 diff --git a/eng/Versions.props b/eng/Versions.props index 8e18456f8..8871b9e33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.11 6.0.11 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 0.2.0 - 6.0.111-servicing.22523.4 - 6.0.111-servicing.22523.4 + 6.0.111-servicing.22523.14 + 6.0.111-servicing.22523.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b3bb659a9d244d5abf8a796ac33b42922074fc38 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 18:07:08 +0000 Subject: [PATCH 13/70] Merged PR 27008: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221023.21 - **Date Produced**: October 24, 2022 4:33:41 AM UTC - **Commit**: 8f6e48c18dda13f4ddb7b447d4602629099d3639 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1] - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCffccd7e&targetVersion=GC8f6e48c&_a=files [2]: https://dev... --- NuGet.config | 6 ++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed082d288..42cd0ea91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,8 +21,7 @@ - - + @@ -51,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ae752fa3..4d68b58b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 + 8f6e48c18dda13f4ddb7b447d4602629099d3639 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54 + 8f6e48c18dda13f4ddb7b447d4602629099d3639 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 37deaa02f76fc3b8df620e305b450b06fe2b685d + 96c5254e5ca5040021caf779216b1b3641875b1e https://github.com/dotnet/fsharp @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/source-build-reference-packages - fdbbfadcaa5804038ad0a3f67c33f489cbeda65c + 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 diff --git a/eng/Versions.props b/eng/Versions.props index 8871b9e33..ec40975ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22519.5 + 6.0.11-servicing.22523.4 - 6.0.11-servicing.22519.2 + 6.0.11-servicing.22523.2 @@ -56,8 +56,8 @@ - 6.0.111-servicing.22523.14 - 6.0.111-servicing.22523.14 + 6.0.111-servicing.22523.21 + 6.0.111-servicing.22523.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.11-servicing.22519.3 - 6.0.11-servicing.22519.3 + 6.0.11-servicing.22523.3 + 6.0.11-servicing.22523.3 6.0.11 6.0.11 From 42209bc6cafb279705df1638256af458d6a55ad6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 01:13:09 +0000 Subject: [PATCH 14/70] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221101.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22551.15 --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 42cd0ea91..bd292ee6b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -19,9 +23,13 @@ + + + + @@ -42,14 +50,20 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d68b58b6..66243155b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f6e48c18dda13f4ddb7b447d4602629099d3639 + 9cad3a1113654fb83fb7d0324b5fafba1d8bfcee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f6e48c18dda13f4ddb7b447d4602629099d3639 + 9cad3a1113654fb83fb7d0324b5fafba1d8bfcee diff --git a/eng/Versions.props b/eng/Versions.props index ec40975ed..ced34f8ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.111-servicing.22523.21 - 6.0.111-servicing.22523.21 + 6.0.112-servicing.22551.15 + 6.0.112-servicing.22551.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c46d4c77df8ed907912e39757b6844773cd9ff2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 19:11:01 +0000 Subject: [PATCH 15/70] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221102.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22552.20 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66243155b..d9e3de13b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cad3a1113654fb83fb7d0324b5fafba1d8bfcee + 6af09134b4c66fa8b6f609aa27d1505ee6fc9847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cad3a1113654fb83fb7d0324b5fafba1d8bfcee + 6af09134b4c66fa8b6f609aa27d1505ee6fc9847 diff --git a/eng/Versions.props b/eng/Versions.props index ced34f8ae..1dd655949 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.112-servicing.22551.15 - 6.0.112-servicing.22551.15 + 6.0.112-servicing.22552.20 + 6.0.112-servicing.22552.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cceb839e95679cf5536e0ea16729d0f9b5af3a0e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Nov 2022 23:43:57 +0000 Subject: [PATCH 16/70] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221104.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22554.17 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9e3de13b..fd794e276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6af09134b4c66fa8b6f609aa27d1505ee6fc9847 + d3b397b549f33e0a9d110d66d13df7d0f9ef0a9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6af09134b4c66fa8b6f609aa27d1505ee6fc9847 + d3b397b549f33e0a9d110d66d13df7d0f9ef0a9f diff --git a/eng/Versions.props b/eng/Versions.props index 1dd655949..93534bf6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.112-servicing.22552.20 - 6.0.112-servicing.22552.20 + 6.0.112-servicing.22554.17 + 6.0.112-servicing.22554.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f132866e03913359edafc67189b2423a237c4676 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 04:58:16 +0000 Subject: [PATCH 17/70] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221104.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22554.17 --- NuGet.config | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd292ee6b..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,16 @@ - - - - - - - - - - - - - @@ -50,21 +37,11 @@ - - - - - - - - - - From 092471a4943cff0014395a49d4bf166a6b17bc95 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 04:28:16 +0000 Subject: [PATCH 18/70] Merged PR 27688: [internal/release/6.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 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.112 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22523.4 to 6.0.112-servicing.22568.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.112 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.11 to 6.0.12 (parent: VS.Redi... --- NuGet.config | 9 ++++ eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++--------- 3 files changed, 77 insertions(+), 68 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..9e1460cfe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -37,13 +42,17 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd141b67b..a41b74fb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 02e45a41b756dd147fc39297df7649d86fa245e7 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e + b6e52bc610f2398430a1657515f9410480527dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e + b6e52bc610f2398430a1657515f9410480527dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e + b6e52bc610f2398430a1657515f9410480527dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3b397b549f33e0a9d110d66d13df7d0f9ef0a9f + 13bb7250d17d7acf42d7ab07c742825445273864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3b397b549f33e0a9d110d66d13df7d0f9ef0a9f + 13bb7250d17d7acf42d7ab07c742825445273864 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 374833d8416df22155bc0509559352af65bd8266 + 851c3772feff6152af1a5013d9204d520a3e7457 https://github.com/dotnet/source-build @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/source-build-reference-packages - 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96 + 38385bc8b19cebe7ae7d20771646158785ee5bdc diff --git a/eng/Versions.props b/eng/Versions.props index e0a69a6f8..953791c4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.111 + 6.0.112 @@ -44,20 +44,20 @@ - 6.0.11 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12 + 6.0.12 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 0.2.0 - 6.0.112-servicing.22554.17 - 6.0.112-servicing.22554.17 + 6.0.112-servicing.22569.1 + 6.0.112-servicing.22569.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 + 6.0.12 + 6.0.12 + 6.0.12 + 6.0.12 2.1.0 - 6.0.11-servicing.22523.3 - 6.0.11-servicing.22523.3 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22554.3 + 6.0.12-servicing.22554.3 + 6.0.12 + 6.0.12 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.111 + 6.0.112 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.11 + 6.0.12 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 169e2ebee2aa1e1329e40139e465bd0f4ade6273 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:20:03 +0000 Subject: [PATCH 19/70] Merged PR 27730: [internal/release/6.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 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.112 to 6.0.112 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.112-servicing.22568.5 to 6.0.112-servicing.22571.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.112 to 6.0.112 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221121.16 - **Date Produced**: November 21, 2022 10:36:07 PM UTC - **Commit**: 6e8cbed761a1b459f59c16c20a57fa75068b004c - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.112-servicing.22569.1 to 6.0.112-servicing.22571.16][1] - **Microsoft.NET.Sdk**: [from 6.0.112-servicing.22569.1 to 6.0.112-servicing.22571.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.112 to 6.0.112][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.112-servicing.22568.5 to 6.0.112-servicing.22571.11][3] ... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e1460cfe..d36e353f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,14 +42,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a41b74fb3..de45e4e28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b6e52bc610f2398430a1657515f9410480527dae + 8a4c083c86eac346022bc0a543dc086268223ca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b6e52bc610f2398430a1657515f9410480527dae + 8a4c083c86eac346022bc0a543dc086268223ca0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b6e52bc610f2398430a1657515f9410480527dae + 8a4c083c86eac346022bc0a543dc086268223ca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 13bb7250d17d7acf42d7ab07c742825445273864 + 6e8cbed761a1b459f59c16c20a57fa75068b004c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 13bb7250d17d7acf42d7ab07c742825445273864 + 6e8cbed761a1b459f59c16c20a57fa75068b004c diff --git a/eng/Versions.props b/eng/Versions.props index 953791c4b..0a1474492 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.112-servicing.22569.1 - 6.0.112-servicing.22569.1 + 6.0.112-servicing.22571.16 + 6.0.112-servicing.22571.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 733b61225be9ba6421698eb6f01d4b141bb50991 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:22:21 +0000 Subject: [PATCH 20/70] Merged PR 27752: [internal/release/6.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.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221122.11 - **Date Produced**: November 22, 2022 5:26:24 PM UTC - **Commit**: c08dc2f35f9e9d99bccae8809a79a06b8b030016 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.112-servicing.22571.16 to 6.0.112-servicing.22572.11][1] - **Microsoft.NET.Sdk**: [from 6.0.112-servicing.22571.16 to 6.0.112-servicing.22572.11][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6e8cbed&targetVersion=GCc08dc2f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4437f08&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de45e4e28..e1d900ec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8a4c083c86eac346022bc0a543dc086268223ca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e8cbed761a1b459f59c16c20a57fa75068b004c + c08dc2f35f9e9d99bccae8809a79a06b8b030016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e8cbed761a1b459f59c16c20a57fa75068b004c + c08dc2f35f9e9d99bccae8809a79a06b8b030016 diff --git a/eng/Versions.props b/eng/Versions.props index 0a1474492..9a966b8e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.112-servicing.22571.16 - 6.0.112-servicing.22571.16 + 6.0.112-servicing.22572.11 + 6.0.112-servicing.22572.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d311a58ee178e4084d570ae5203e22c1e5e174b7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:16 +0000 Subject: [PATCH 21/70] Merged PR 27852: [internal/release/6.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 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20221128.6 - **Date Produced**: November 28, 2022 11:32:45 PM UTC - **Commit**: 3f5b64d07c067bc141d6ff32e49c9b180e1f19bc - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.112-servicing.22572.11 to 6.0.112-servicing.22578.6][1] - **Microsoft.NET.Sdk**: [from 6.0.112-servicing.22572.11 to 6.0.112-servicing.22578.6][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc08dc2f&targetVersion=GC3f5b64d&_a=files [2]: https://de... --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index d36e353f6..6cba51d6d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,11 @@ + + @@ -19,9 +21,10 @@ + - + @@ -42,6 +45,7 @@ + @@ -49,10 +53,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1d900ec6..154615e87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8a4c083c86eac346022bc0a543dc086268223ca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c08dc2f35f9e9d99bccae8809a79a06b8b030016 + 3f5b64d07c067bc141d6ff32e49c9b180e1f19bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c08dc2f35f9e9d99bccae8809a79a06b8b030016 + 3f5b64d07c067bc141d6ff32e49c9b180e1f19bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9a966b8e5..b2d7a9448 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22568.10 - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 @@ -56,8 +56,8 @@ - 6.0.112-servicing.22572.11 - 6.0.112-servicing.22572.11 + 6.0.112-servicing.22578.6 + 6.0.112-servicing.22578.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.12-servicing.22554.3 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4 + 6.0.12-servicing.22578.4 6.0.12 6.0.12 From ce091b04668654e17a7602d56c947d270064a703 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 16:57:37 +0000 Subject: [PATCH 22/70] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 28 ++++++++++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cba51d6d..4ba5f1f8d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,39 @@ + + + + + + + + + + + + + + + + @@ -46,17 +62,29 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 154615e87..885dd2c1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8a4c083c86eac346022bc0a543dc086268223ca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5b64d07c067bc141d6ff32e49c9b180e1f19bc + ef19138b81d16e0c24b9cd0b5e1836d05be3255f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5b64d07c067bc141d6ff32e49c9b180e1f19bc + ef19138b81d16e0c24b9cd0b5e1836d05be3255f diff --git a/eng/Versions.props b/eng/Versions.props index 96c7c74b6..cd3726c3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.112-servicing.22578.6 - 6.0.112-servicing.22578.6 + 6.0.113-servicing.22579.35 + 6.0.113-servicing.22579.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a23b50f9783e31c496e8c21b8f117351feea870 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 2 Dec 2022 01:24:30 +0000 Subject: [PATCH 23/70] Merged PR 28071: [internal/release/6.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 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.112 to 6.0.113 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.112-servicing.22571.11 to 6.0.113-servicing.22580.44 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.112 to 6.0.113 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.12-servicing.22569.2 to 6.0.13-servicing.22601.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) ... --- NuGet.config | 51 ++++------------------ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 80 insertions(+), 113 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ba5f1f8d..6534504cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,40 +7,21 @@ - - - - - - + - - - - - - + - - + - - - - - - + - - - - + @@ -61,31 +42,17 @@ - - - - - - + - - + - - - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 885dd2c1d..ca15599a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8a4c083c86eac346022bc0a543dc086268223ca0 + 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8a4c083c86eac346022bc0a543dc086268223ca0 + 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8a4c083c86eac346022bc0a543dc086268223ca0 + 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef19138b81d16e0c24b9cd0b5e1836d05be3255f + 386bb5e6412bd32d06d293c60c16d1ff49b9e686 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef19138b81d16e0c24b9cd0b5e1836d05be3255f + 386bb5e6412bd32d06d293c60c16d1ff49b9e686 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 851c3772feff6152af1a5013d9204d520a3e7457 + 14d64a811e8d4140438f9a8288abb139cb56d5de https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index cd3726c3c..c8dde2855 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22601.1 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22601.5 - 6.0.112 + 6.0.113 @@ -44,20 +44,20 @@ - 6.0.12 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 + 6.0.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 0.2.0 - 6.0.113-servicing.22579.35 - 6.0.113-servicing.22579.35 + 6.0.113-servicing.22601.32 + 6.0.113-servicing.22601.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 + 6.0.13 + 6.0.13 2.1.0 - 6.0.12-servicing.22578.4 - 6.0.12-servicing.22578.4 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22601.6 + 6.0.13-servicing.22601.6 + 6.0.13 + 6.0.13 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.112 + 6.0.113 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.12 + 6.0.13 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From c39a914eccc28173347b7fefba7da4bc3c5b3a1c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:42 -0800 Subject: [PATCH 24/70] Update branding to 6.0.114 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 95d716c41..81f45d495 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8429945e1c44a75ab085ec70d7ef6529f9370e86 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:49:09 -0800 Subject: [PATCH 25/70] [6.0.1xx] Update Asp.Net templates (#15245) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8c37d5e87..2a1d564d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.31 + 3.1.32 3.2.1 4.8.0-rc2.19462.10 From b6ccfab5b704ff1f4a00213e5edd53646154c778 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 11 Jan 2023 06:38:11 -0800 Subject: [PATCH 26/70] .NET Source-Build 6.0.113 January 2023 Updates (#15250) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2a1d564d9..7092f8531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.112 + 6.0.113 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 37a961c91..daee7866a 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.112" + "dotnet": "6.0.113" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From d625ce4fb014d3d6e0d854076359a89fc86230b5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 11 Jan 2023 15:34:43 -0600 Subject: [PATCH 27/70] Disable CheckEolTargetFramework for all projects (#15222) --- src/SourceBuild/tarball/content/repos/Directory.Build.props | 3 +++ src/SourceBuild/tarball/content/repos/fsharp.proj | 1 - src/SourceBuild/tarball/content/repos/xliff-tasks.proj | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 100183a09..c178de4ec 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -98,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 4d00be9ad..a03a69fc5 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj b/src/SourceBuild/tarball/content/repos/xliff-tasks.proj index 7964fabdc..a5881adb4 100644 --- a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj +++ b/src/SourceBuild/tarball/content/repos/xliff-tasks.proj @@ -3,8 +3,6 @@ $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false From cc5bd785a23386435ff90a6f350115b81d353b08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 22:23:56 +0000 Subject: [PATCH 28/70] [release/6.0.1xx] Update dependencies from dotnet/arcade (#15263) [release/6.0.1xx] Update dependencies from dotnet/arcade --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 6 +++--- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6534504cb..14a0481f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,11 @@ - + + @@ -19,9 +20,13 @@ + + + + @@ -42,16 +47,19 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca15599a1..993e9cbf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7092f8531..abee852d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22561.1 + 6.0.0-beta.23060.6 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb0..51f30e53d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcd..b5b3e5aeb 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 30864f9a7..50c158ed8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111", + "dotnet": "6.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" } } From 9dfa832bb92306f6a3676874e5c48db7aab25f37 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Jan 2023 18:05:42 +0000 Subject: [PATCH 29/70] Update smoke-tests to target net8 --- .../Microsoft.DotNet.SourceBuild.SmokeTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj index a923fece0..ffeedb3f0 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable false From b743cc9964e25ee5a3c419b529d5b4015dbf2aa0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Jan 2023 18:24:00 +0000 Subject: [PATCH 30/70] Revert "Update smoke-tests to target net8" This reverts commit 9dfa832bb92306f6a3676874e5c48db7aab25f37. --- .../Microsoft.DotNet.SourceBuild.SmokeTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj index ffeedb3f0..a923fece0 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj @@ -1,7 +1,7 @@ - net8.0 + net7.0 enable false From de87c6c89c81daabb218f97f9f715b696a69c394 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Jan 2023 15:55:36 -0600 Subject: [PATCH 31/70] remove unnecessary nowarn from source-build SBRP project (#15302) --- .../tarball/content/repos/source-build-reference-packages.proj | 2 -- 1 file changed, 2 deletions(-) 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 9f7c3853c..c1321e716 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -16,8 +16,6 @@ true - - NU1504 From e36f7f3feaa561782a66165b8db55f4c0bbdf963 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 23 Jan 2023 18:26:27 -0800 Subject: [PATCH 32/70] [release/7.0.1xx] Add CI for building with N-1 source-built SDK (#15164) --- eng/Versions.props | 1 + .../job/source-build-build-tarball.yml | 29 +++++++++++++++++++ .../job/source-build-run-tarball-build.yml | 14 +++++++++ .../pipelines/security-partners-dotnet.yml | 1 + 4 files changed, 45 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index c5ab2374a..6014b3ff2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,6 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> + 7.0.102 7.0.102-4 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9ae170d1c..9e67adb4d 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -101,6 +101,35 @@ jobs: Contents: '*.tar.gz' TargetFolder: $(tarballDir)/packages/archive/ + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + - script: | set -x 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 5459e8415..efa1ff1af 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 @@ -41,31 +41,43 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true + _WithPreviousSDK: false CentOSStream8-Offline: _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false + _WithPreviousSDK: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true CentOSStream9-Offline: _BootstrapPrep: true _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false Fedora36-Offline: _BootstrapPrep: true _Container: ${{ parameters.fedora36Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false Ubuntu2004-Offline: _BootstrapPrep: true _Container: ${{ parameters.ubuntu2004Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -89,6 +101,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -109,6 +122,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64_Using_Previous pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 69bef21e9..6200e7fc0 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -12,6 +12,7 @@ jobs: _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false + _WithPreviousSDK: false name: Build_Tarball_x64 pool: name: NetCore1ESPool-Svc-Internal From 41a85aa01de9c5ec2a4303f9a2c356da728614f3 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 2 Feb 2023 13:06:10 -0600 Subject: [PATCH 33/70] Disable secure supply chain check. These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved. --- .../eng/pipelines/security-partners-dotnet.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index f96c9fb37..73dd514c5 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: From 64974afa6740dcd928c1439019714fbb8eb1a8d9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sun, 20 Nov 2022 18:40:04 -0600 Subject: [PATCH 34/70] Remove source-build manipulation of stable version. --- eng/Version.Details.xml | 2 +- .../Arcade/src/Tarball_WriteSourceRepoProperties.cs | 1 - src/SourceBuild/tarball/content/Directory.Build.props | 10 ---------- .../tarball/content/repos/Directory.Build.props | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 259ae5e94..aa19ec606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -20,6 +20,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d037e070ebe5c83838443f869d5800752b0fcb13 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -32,7 +33,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d037e070ebe5c83838443f869d5800752b0fcb13 - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index b177b6f01..0dc26774e 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -71,7 +71,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks ["OfficialBuildId"] = derivedVersion.OfficialBuildId, ["OutputPackageVersion"] = dependency.Version, ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", }; if (!string.IsNullOrEmpty(dependency.GitCommitCount)) { diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 6ca72bb7a..7015abb06 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -213,16 +213,6 @@ - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..b0d5f8735 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -15,7 +15,6 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 - true $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ From 0f737ee97471ea6ce324d9edc434b3f03a85996d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 3 Feb 2023 08:50:44 -0600 Subject: [PATCH 35/70] We do need these but they should be set to the version of the runtime we got, not the one we feed in. --- src/SourceBuild/tarball/content/Directory.Build.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 7015abb06..05500511a 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -213,6 +213,16 @@ + + + + + + + + + + From 51ba61a4f9bc26665cc262db0728f4bcbe51df62 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 3 Feb 2023 16:06:52 -0600 Subject: [PATCH 36/70] Replace RID-specific versions with App.Ref versions. These are expected to be the same version number and cause fewer problems for people who are building on RIDs that do not match our PSB RID. --- .../tarball/content/Directory.Build.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 05500511a..2f4a8ee71 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -216,13 +216,13 @@ - + - + - - - + + + @@ -238,8 +238,8 @@ - - + + From 5533b337bb2141a659ff475daf5b9869a6ef7cff Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 2 Feb 2023 13:06:10 -0600 Subject: [PATCH 37/70] Disable secure supply chain check. These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved. --- .../eng/pipelines/security-partners-dotnet.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 6200e7fc0..97b520dca 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: From 65e657b063daee477190a41a0f0eac0b0a56a45b Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 2 Feb 2023 13:07:55 -0600 Subject: [PATCH 38/70] Enable bootstrap in tarball build. We now expect all builds using the Microsoft-built SDK to also use bootstrap. Mixed RIDness between the bootstrap SDK and previously-source-built packages is not supported. --- .../tarball/content/eng/pipelines/security-partners-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 97b520dca..02641873b 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -20,7 +20,7 @@ jobs: excludeSdkContentTests: true matrix: Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd _EnablePoison: false _ExcludeOmniSharpTests: false From ccc4b086fc4fbd276cd982dd403c398e6bff2aae Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Feb 2023 11:41:50 -0800 Subject: [PATCH 39/70] Update branding to 6.0.310 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7abfaa002..5afe43e4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 5c68d96fd2c4a4f3a9071b687f505832e61536f5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Feb 2023 11:44:59 -0800 Subject: [PATCH 40/70] Update branding to 6.0.407 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 018ae1453..c4b66ec00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b278e8143e9c2708b18b4d23098cdd62f5b4c17a Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:57:45 -0800 Subject: [PATCH 41/70] Update branding to 6.0.115 (#15459) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index abee852d7..40e7bda69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 959861970b784d379f5baf3170708f926ff0b7b5 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:01:54 -0800 Subject: [PATCH 42/70] Update branding to 7.0.104 (#15461) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6014b3ff2..d10a1d34f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 535d6f657c1d8470aa69259379566bc3cf0b107f Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:15:41 +0100 Subject: [PATCH 43/70] [automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15279) Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet-Bot Co-authored-by: MichaelSimons Co-authored-by: Chris Rummel Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Daniel Plaisted --- .../content/repos/Directory.Build.props | 3 +++ .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index b0d5f8735..625d3fb5b 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -98,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 3ffd14406..bc9a10be7 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824..9fb5965a4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" + + diff --git a/test/SdkTests/TestsToSkipOSX.xml b/test/SdkTests/TestsToSkipOSX.xml new file mode 100644 index 000000000..09330bb1f --- /dev/null +++ b/test/SdkTests/TestsToSkipOSX.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From f0a9fa30d32d5a603790979ff3ac135c42792b53 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:53:26 +0100 Subject: [PATCH 44/70] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15458) Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: Marc Paine --- .../eng/pipelines/security-partners-dotnet.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index f96c9fb37..73dd514c5 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: From 8b9ae4165224430a86d6d5b316bcc95e9b704cb6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 23:21:49 +0100 Subject: [PATCH 45/70] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15473) Co-authored-by: Sean Reeser Co-authored-by: Daniel Plaisted Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: Marc Paine Co-authored-by: Jason Zhai --- .../eng/pipelines/security-partners-dotnet.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index f96c9fb37..73dd514c5 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: From 0709aa684bebd00a44d298d05db8c86d23f9f192 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 9 Feb 2023 16:08:09 -0800 Subject: [PATCH 46/70] [release/7.0.1xx] Update checksum generation order (#15397) (#15481) Co-authored-by: Michael Simons --- eng/AfterSigning.targets | 24 ++++++++++++++++++++++++ src/redist/redist.csproj | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eng/AfterSigning.targets diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets new file mode 100644 index 000000000..b8a08378a --- /dev/null +++ b/eng/AfterSigning.targets @@ -0,0 +1,24 @@ + + + <_SuppressSdkImports>false + + + + + + + + + + + + + %(FullPath).sha512 + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index d9b868ecc..554b1b1ee 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -47,5 +47,4 @@ - From f66604ee7ad22537be34cc0bee4a4c63a4b10d63 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:51:20 -0800 Subject: [PATCH 47/70] Merging internal commits for release/6.0.1xx (#15533) Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Matt Mitchell Co-authored-by: Marc Paine --- NuGet.config | 26 ++---- eng/Version.Details.xml | 102 ++++++++++----------- eng/Versions.props | 46 +++++----- test/SdkTests/TestsToSkipPortableLinux.xml | 8 ++ 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index 14a0481f6..287683d61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + - + - - - + - - - + @@ -47,20 +42,17 @@ + - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 993e9cbf0..68c4766c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - c60eee85ec0109bdda894806b167bb4d55f75183 + + https://github.com/nuget/nuget.client + 822425710cec4e49c9344ada58c21c7d3223973b @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 14d64a811e8d4140438f9a8288abb139cb56d5de + 9f2e9f6ec690ad8f4aea16b33f4a4bcc11b3d2cb https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 40e7bda69..0f6df721d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23074.3 - 6.0.113 + 6.0.114 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.113-servicing.22601.32 - 6.0.113-servicing.22601.32 + 6.0.114-servicing.23074.26 + 6.0.114-servicing.23074.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.113 + 6.0.114 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index f9fe2c166..734362867 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -7,5 +7,13 @@ + + + + From 0fdf746d877ee8c9431cd7abebb2b826770e653c Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:52:06 -0800 Subject: [PATCH 48/70] Merging internal commits for release/6.0.3xx (#15534) Co-authored-by: DotNet-Bot Co-authored-by: dotnet-bot --- NuGet.config | 16 +++---- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index f93da753d..d32bdf112 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dd95ce46..e92ec822e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d + + https://github.com/nuget/nuget.client + 51ca5ad938c742e6ff876ea1545b0712b130f9d1 diff --git a/eng/Versions.props b/eng/Versions.props index 5afe43e4b..2bbb436a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23074.3 - 6.0.308 + 6.0.309 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.308-servicing.22601.36 - 6.0.308-servicing.22601.36 + 6.0.309-servicing.23074.34 + 6.0.309-servicing.23074.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.308 + 6.0.309 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 3e9dc15889fc0f09ec369d99ef80f0d3a7858867 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:53:14 -0800 Subject: [PATCH 49/70] Merging internal commits for release/6.0.4xx (#15535) Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Matt Mitchell --- NuGet.config | 22 ++++----- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 3 files changed, 79 insertions(+), 85 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8d7143758..6c3e5b378 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,20 @@ + - + - - - + - - - + @@ -44,19 +41,16 @@ + - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a54de844..2580ea82d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 01bc4df1ef99c9c213f892ec8b25e46b23c7cfb1 + + https://github.com/nuget/nuget.client + a90539fd502f9425311b34451cdd2965516f5d26 diff --git a/eng/Versions.props b/eng/Versions.props index c4b66ec00..a89efaa14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23074.3 - 6.0.405 + 6.0.406 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.405-servicing.22601.33 - 6.0.405-servicing.22601.33 + 6.0.406-servicing.23074.29 + 6.0.406-servicing.23074.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.405 + 6.0.406 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1fcdbe277d9f475253b4eb02939bb6bd50fd528f Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:55:02 -0800 Subject: [PATCH 50/70] Merging internal commits for release/7.0.1xx (#15536) Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Chris Rummel Co-authored-by: Marc Paine --- NuGet.config | 17 ++- eng/Version.Details.xml | 126 +++++++++--------- eng/Versions.props | 48 +++---- ...solvePackageFileConflicts-workaround.patch | 23 ---- 4 files changed, 103 insertions(+), 111 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/NuGet.config b/NuGet.config index 0f076a132..ad090420b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,26 @@ + + + + - + + + + + + @@ -39,11 +48,17 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa19ec606..9aa70ccdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + 0a2bda10e81d901396c3cff95533529e3a93ad47 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 0a2bda10e81d901396c3cff95533529e3a93ad47 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 0a2bda10e81d901396c3cff95533529e3a93ad47 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df04c57b2e2bb986f0afc2384cbebb3c950447b5 + 0a09c7d17212981cb4fd5907fa6a6214966a366d https://github.com/dotnet/fsharp @@ -138,38 +138,38 @@ c02ece877c62577810f893c44279ce79af820112 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker - + https://github.com/dotnet/roslyn - d7a61210a88b584ca0827585ec6e871c6b1c5a14 + 0760f14ebbc4a4f2a4fa282994d9e43b49f9795c https://github.com/dotnet/msbuild - 9a89d02ff5de19d84190ebed4a6017df4dc19dc4 + fedecea9d0d923d3520309dcf69e1dd4a485ef75 - + https://github.com/nuget/nuget.client - 125f673fd1cdb3cc012f62aa3ce764d2460b89eb + da5b9fa1595e212914854a9ff4a18a6759ed4729 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index d10a1d34f..86ef961a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.2-servicing.22606.8 + 7.0.3-servicing.23072.1 - 7.0.2-servicing.22606.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.2 - 7.0.2 - 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 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 0.2.0 - 7.0.102 - 7.0.102-servicing.22607.4 - 7.0.102-servicing.22607.4 + 7.0.103 + 7.0.103-servicing.23080.6 + 7.0.103-servicing.23080.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.2-servicing.22606.5 - 7.0.2-servicing.22606.5 - 7.0.2 - 7.0.2 - 7.0.2 - 7.0.2 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 + 7.0.3 + 7.0.3 + 7.0.3 + 7.0.3 2.1.0 - 7.0.2-servicing.22607.1 - 7.0.2-servicing.22607.1 - 7.0.2 - 7.0.2 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 + 7.0.3 + 7.0.3 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.2 - 7.0.2 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - From 45d5d425f7576ea63b678ac5bd6c4f12258a6e32 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:35:45 -0800 Subject: [PATCH 51/70] [release/6.0.4xx] Bump missed ASP.NET template version (#15549) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a89efaa14..c73c08233 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -140,7 +140,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From b1d131603a10ef34a6dda82461d35a48f96660c9 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:35:48 -0800 Subject: [PATCH 52/70] [release/6.0.3xx] Bump missed ASP.NET template version (#15550) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2bbb436a9..892fd05f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -140,7 +140,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From 6d3cb5a4f9f758114727bce6a7fd965097a763fa Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:37:20 -0800 Subject: [PATCH 53/70] [release/7.0.1xx] Bump ASP.NET template versions (#15548) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 86ef961a8..aef16b440 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -159,7 +159,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From 7baf416472183c2281c3f56f863d9312ad8dfe8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:06:49 -0800 Subject: [PATCH 54/70] [release/7.0.2xx] Update dependencies from dotnet/arcade (#15557) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 17 ++++++++++++++--- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 115e019e1..daf27e784 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,24 @@ + + - - - + + + + + @@ -45,16 +49,23 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f142d42a3..a8df6366f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c7cab947c..3fd223333 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23108.1 + 7.0.0-beta.23114.3 diff --git a/global.json b/global.json index 40e2f263c..5039463a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.102", + "dotnet": "7.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" } } From 42aca7c867b94c84c99376068c7584a1b1ecb9cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:53:22 -0800 Subject: [PATCH 55/70] [release/6.0.4xx] Update dependencies from dotnet/arcade (#15562) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c3e5b378..82043164c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,17 @@ + + + + + @@ -41,15 +48,22 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2580ea82d..58fd16726 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c73c08233..b9376b1f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23060.6 + 6.0.0-beta.23114.5 diff --git a/global.json b/global.json index 50c158ed8..85690be2c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.113", + "dotnet": "6.0.114", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5" } } From d5dd89bb88dbe03f194295c56e034436f3e7e975 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 07:54:43 -0800 Subject: [PATCH 56/70] [release/7.0.1xx] Update dependencies from dotnet/arcade (#15559) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 17 +++++- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 48 ++++++++++++++- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 0 -> 3810 bytes eng/common/templates/job/execute-sdl.yml | 3 +- eng/common/templates/job/onelocbuild.yml | 43 +++++++------ .../templates/job/publish-build-assets.yml | 14 ++++- eng/common/templates/job/source-build.yml | 7 ++- .../templates/job/source-index-stage1.yml | 5 +- eng/common/templates/jobs/jobs.yml | 9 --- .../templates/post-build/post-build.yml | 12 ++-- .../templates/variables/pool-providers.yml | 57 ++++++++++++++++++ global.json | 6 +- 14 files changed, 178 insertions(+), 57 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/NuGet.config b/NuGet.config index ad090420b..1df34ab49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,23 +8,27 @@ + + - - - + + + + + @@ -48,16 +52,23 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9aa70ccdb..9b55dbf54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index aef16b440..740da52e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23060.4 + 7.0.0-beta.23114.3 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bab18543d..bcb579e37 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} $xlfFiles = @() @@ -91,6 +110,7 @@ $locJson = @{ ) }, @{ + LanguageSet = $LanguageSet CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( @@ -98,8 +118,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { + if ($_.FullName.Contains($exclusion)) { $continue = $false } } @@ -110,7 +129,30 @@ $locJson = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath - Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath } } } diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 0000000000000000000000000000000000000000..6661fed566e49b0c206665bc21f135e06c9b89c4 GIT binary patch literal 3810 zcmd^CT~8BH5S?ce|HG9Bo&v?0;P_m6l= znU-wb=}VLT7UH{>{5H;0M4iLmRE8QeBRr|>&k=uV*L;heKY+dq>B$0^=0I}|x`)s{ zht4t9zaiEh5Fe>E-;zVT;c4G?v;9N0G=rWwo~*(Cs`OS6ZL`HL;vsL0J@I%$+0YvE zx{9ukK|FtFx1PlPD5M;6ZM>f;1BhCf?`8y6QH*?RT9T>XwF z#~m_N+i^UKE^j{e;KdNW`kH9Rbj{G8tDY}mafCgG+m3H`I@_PhrDmcIzxD&IX@s083kV|lLUE^0(h6wWRPN0QN1n^PU5eX8r6OZ*s^g)tt77#SZCB}znxye#U$Dtinr6lnVu z!LzA{A}0~no7p$thFGJAnI}oSW||9H=Bz}I7kD#2MLg7WfrlE5o9sQjePc>qmv+6iQCmdp(y}(Vr literal 0 HcmV?d00001 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index aaeb83b4d..7c164ac02 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -46,6 +46,7 @@ jobs: - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + - template: /eng/common/templates/variables/pool-providers.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -53,7 +54,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6b8fc9970..60ab00c4d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -14,6 +14,7 @@ parameters: ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' @@ -22,13 +23,25 @@ parameters: MirrorRepo: '' MirrorBranch: main condition: '' + JobNameSuffix: '' jobs: -- job: OneLocBuild +- job: OneLocBuild${{ parameters.JobNameSuffix }} dependsOn: ${{ parameters.dependsOn }} - displayName: OneLocBuild + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -40,27 +53,17 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - steps: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1cbb6a0c5..c5fedd7f7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,15 +34,15 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets ${{ else }}: displayName: Publish to Build Asset Registry - pool: ${{ parameters.pool }} - variables: + - template: /eng/common/templates/variables/pool-providers.yml - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats @@ -51,6 +51,16 @@ jobs: - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44a..8a3deef2b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -44,13 +44,16 @@ jobs: ${{ if eq(parameters.platform.pool, '') }}: # The default VM host AzDO pool. This should be capable of running Docker containers: almost all # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 59a42c338..09c506d11 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -22,16 +22,17 @@ jobs: value: ${{ parameters.binlogPath }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 297e7946b..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -88,15 +88,6 @@ jobs: - ${{ job.job }} - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 957375c1c..c051f1b65 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -95,6 +95,7 @@ stages: displayName: Validate Build Assets variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: NuGet Validation @@ -106,7 +107,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +144,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +204,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -251,6 +252,7 @@ stages: displayName: Publish using Darc variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: Publish Using Darc @@ -262,7 +264,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -282,4 +284,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml new file mode 100644 index 000000000..99c80212b --- /dev/null +++ b/eng/common/templates/variables/pool-providers.yml @@ -0,0 +1,57 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS) +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage these can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: +# +# pool: +# name: $(DncEngInternalBuildPool) +# demands: ImageOverride -equals windows.vs2019.amd64 + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index c4142c606..5039463a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.102", + "dotnet": "7.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" } } From aca89f19d00c2c27da1e1bb887a133ac602486ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 10:34:28 -0800 Subject: [PATCH 57/70] [release/7.0.2xx] Update dependencies from dotnet/test-templates (#15567) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8df6366f..6711e9149 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a diff --git a/eng/Versions.props b/eng/Versions.props index 3fd223333..5ecffc42b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 From c32738ee77d31338329c4eca349e2de8af0aeea1 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 16 Feb 2023 17:26:44 -0600 Subject: [PATCH 58/70] .NET Source-Build 7.0.103 February 2023 Updates (#15561) --- eng/Versions.props | 4 ++-- .../eng/bootstrap/buildBootstrapPreviouslySB.csproj | 4 +++- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MsftToSbSdk.diff | 7 +------ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 740da52e0..dcdece83a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.102 - 7.0.102-4 + 7.0.103 + 7.0.103 diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 4f2bbd079..256cde2a2 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -78,7 +78,7 @@ Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" /> - + @@ -94,10 +94,12 @@ diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 01432c896..4ebdc2be0 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.102" + "dotnet": "7.0.103" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 3276c1cb4..74ad4390c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -456,7 +456,7 @@ index ------------ +./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll @@ -734,11 +734,6 @@ index ------------ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll -+./sdk/x.y.z/Roslyn/bincore/runtimes/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll +./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll +./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll From 7d72c5a676b8fb4e1d03585bfec8a039c0693c74 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 27 Feb 2023 09:13:26 -0800 Subject: [PATCH 59/70] Increase branding version and downgrade implicit version to enable hotfix release (#15587) --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..466f3d5da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 7 0 2 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 391078d3c..fc64d3a14 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 13)) From bb6c9105d91834d83f4dc90e8d131489f459fc4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 17:32:49 +0000 Subject: [PATCH 60/70] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15708) [release/7.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffc64083e..436c806b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec - + https://github.com/dotnet/sdk - 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd + 201db70f2b8213018f0e01d3f40e2e30c880a1ec diff --git a/eng/Versions.props b/eng/Versions.props index d0d130275..6a1eb4f55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23155.1 - 7.0.300-preview.23155.1 - 7.0.300-preview.23155.1 + 7.0.300-preview.23156.2 + 7.0.300-preview.23156.2 + 7.0.300-preview.23156.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f70d7defe75eec331087cfcce6130ec99d8b449a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:02:20 -0800 Subject: [PATCH 61/70] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15709) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 436c806b6..ed66b0a3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 - + https://github.com/dotnet/sdk - 201db70f2b8213018f0e01d3f40e2e30c880a1ec + 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 81404ba772fe054b1ccd1b4cc67a59d44967c926 + 1314d090671dc1a1500c5303c4b5ae9150f40d98 diff --git a/eng/Versions.props b/eng/Versions.props index 6a1eb4f55..cb2b7a7d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.2 - 7.0.300-preview.23156.2 - 7.0.300-preview.23156.2 + 7.0.300-preview.23156.7 + 7.0.300-preview.23156.7 + 7.0.300-preview.23156.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1a18e43729d72e502cfbc1ed2d5ab1c8102885f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:04:00 -0800 Subject: [PATCH 62/70] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15710) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed66b0a3c..a4256ed6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 - + https://github.com/dotnet/sdk - 75a7e8b8ad4f21b2be08c43efa02000f3854fbb1 + e719ec15410358ebc222bb015b1ec714a2e76563 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - ab771de3c23cebcf699e1753500a8649eb4b6272 + 4fe02408af45297c07da59626108a73edbb8ad32 - + https://github.com/dotnet/fsharp - ab771de3c23cebcf699e1753500a8649eb4b6272 + 4fe02408af45297c07da59626108a73edbb8ad32 diff --git a/eng/Versions.props b/eng/Versions.props index cb2b7a7d9..8f830e94e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.7 - 7.0.300-preview.23156.7 - 7.0.300-preview.23156.7 + 7.0.300-preview.23156.11 + 7.0.300-preview.23156.11 + 7.0.300-preview.23156.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 97c30ca066e6f1ce95bf70af32ff0b3fd7251e82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Mar 2023 06:44:09 +0000 Subject: [PATCH 63/70] Update dependencies from https://github.com/dotnet/sdk build 20230306.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23156.11 -> To Version 7.0.300-preview.23156.16 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23152-03 -> To Version 17.6.0-preview-23157-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4256ed6f..ffbda0716 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 - + https://github.com/dotnet/sdk - e719ec15410358ebc222bb015b1ec714a2e76563 + ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 47a712160eb420136ec983be5e0f412dc1c25b55 + 747ecc3420e49f2fd43c0bfaaf0e873575bae586 diff --git a/eng/Versions.props b/eng/Versions.props index 8f830e94e..0afc8d458 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.11 - 7.0.300-preview.23156.11 - 7.0.300-preview.23156.11 + 7.0.300-preview.23156.16 + 7.0.300-preview.23156.16 + 7.0.300-preview.23156.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb91038a827521fd26f499e4b71e3ef1b4fd855f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 7 Mar 2023 10:22:58 -0800 Subject: [PATCH 64/70] Update branding to 7.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 466f3d5da..3bdbf0733 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 1347445515f7123eb3e2e4503caf421d1dcced08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 19:50:31 +0000 Subject: [PATCH 65/70] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15723) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23156.2 to 12.5.0-beta.23157.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23156.2 to 7.0.300-beta.23157.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffbda0716..f99793d89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd - + https://github.com/dotnet/sdk - ed49f22d8b915c3e8d3aefbe91971c95ae7020f4 + 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 4fe02408af45297c07da59626108a73edbb8ad32 + d8b592e358fb86e3b34b166bf6fff2d52c6c6446 - + https://github.com/dotnet/fsharp - 4fe02408af45297c07da59626108a73edbb8ad32 + d8b592e358fb86e3b34b166bf6fff2d52c6c6446 diff --git a/eng/Versions.props b/eng/Versions.props index 0afc8d458..21299c5da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23156.16 - 7.0.300-preview.23156.16 - 7.0.300-preview.23156.16 + 7.0.300-preview.23157.7 + 7.0.300-preview.23157.7 + 7.0.300-preview.23157.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0378c917907d50ca392f893c374e419b5ca19ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 02:11:55 +0000 Subject: [PATCH 66/70] Update dependencies from https://github.com/dotnet/sdk build 20230307.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23157.7 -> To Version 7.0.300-preview.23157.24 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f99793d89..97ea77a4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd - + https://github.com/dotnet/sdk - 0ab00b913ef8765c3c27437c9a412c8b6ea9c2fd + 558a8884369adc0ec846b2d3256b949e26fc2efd diff --git a/eng/Versions.props b/eng/Versions.props index 21299c5da..af62c311f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23157.7 - 7.0.300-preview.23157.7 - 7.0.300-preview.23157.7 + 7.0.300-preview.23157.24 + 7.0.300-preview.23157.24 + 7.0.300-preview.23157.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f968ecb731dedfbbaf455fd4b136d7d6edb80663 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 03:58:51 +0000 Subject: [PATCH 67/70] Update dependencies from https://github.com/dotnet/sdk build 20230307.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23157.24 -> To Version 7.0.300-preview.23157.35 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23157-01 -> To Version 17.6.0-preview-23157-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97ea77a4f..29188174b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 - + https://github.com/dotnet/sdk - 558a8884369adc0ec846b2d3256b949e26fc2efd + c7aa39967e179e23ef54c1068d9a067f2bebf738 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 747ecc3420e49f2fd43c0bfaaf0e873575bae586 + 1a6d753a7648baf0cc991af0c0d254a41d36eba6 diff --git a/eng/Versions.props b/eng/Versions.props index af62c311f..5bc081b85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23157.24 - 7.0.300-preview.23157.24 - 7.0.300-preview.23157.24 + 7.0.300-preview.23157.35 + 7.0.300-preview.23157.35 + 7.0.300-preview.23157.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c0f81bb30cb7a5dda134b3c5877d6a22c85ad71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 13:11:20 -0800 Subject: [PATCH 68/70] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15738) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29188174b..16c54158e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d - + https://github.com/dotnet/sdk - c7aa39967e179e23ef54c1068d9a067f2bebf738 + c94357641a738ee5bb6a65b9e0f79b30b26ccb7d @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - d8b592e358fb86e3b34b166bf6fff2d52c6c6446 + edebe8edefbfa795ba776deb9470b2a80a2bfdc4 - + https://github.com/dotnet/fsharp - d8b592e358fb86e3b34b166bf6fff2d52c6c6446 + edebe8edefbfa795ba776deb9470b2a80a2bfdc4 diff --git a/eng/Versions.props b/eng/Versions.props index 5bc081b85..8b849c8d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23157.35 - 7.0.300-preview.23157.35 - 7.0.300-preview.23157.35 + 7.0.300-preview.23158.14 + 7.0.300-preview.23158.14 + 7.0.300-preview.23158.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ede3cbf328ef0081b7586874f8b9f5de5f7e7b9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 23:26:40 +0000 Subject: [PATCH 69/70] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15744) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23158.4 to 12.5.0-beta.23158.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23158.4 to 7.0.300-beta.23158.5 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.2.29 to 6.6.0-preview.3.42 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16c54158e..e01374a73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 - + https://github.com/dotnet/sdk - c94357641a738ee5bb6a65b9e0f79b30b26ccb7d + 701383aea38328e5e4a947d201bb0b5f8eeea582 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - edebe8edefbfa795ba776deb9470b2a80a2bfdc4 + 225eaa6ddb994e7c74c7eac1e301f688366f1b78 - + https://github.com/dotnet/fsharp - edebe8edefbfa795ba776deb9470b2a80a2bfdc4 + 225eaa6ddb994e7c74c7eac1e301f688366f1b78 @@ -154,9 +154,9 @@ 1a6d753a7648baf0cc991af0c0d254a41d36eba6 - + https://github.com/nuget/nuget.client - 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 + 9ebbe50f56c5e508f631946f1424fe93934b329c diff --git a/eng/Versions.props b/eng/Versions.props index 8b849c8d3..692641741 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23158.14 - 7.0.300-preview.23158.14 - 7.0.300-preview.23158.14 + 7.0.300-preview.23158.27 + 7.0.300-preview.23158.27 + 7.0.300-preview.23158.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15f10dbff379a85f4bd8e649242cff382fdaf627 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 07:43:50 +0000 Subject: [PATCH 70/70] Update dependencies from https://github.com/dotnet/sdk build 20230308.52 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23158.27 -> To Version 7.0.300-preview.23158.52 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23157-03 -> To Version 17.6.0-preview-23159-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e01374a73..52f99ca71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c - + https://github.com/dotnet/sdk - 701383aea38328e5e4a947d201bb0b5f8eeea582 + 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 1a6d753a7648baf0cc991af0c0d254a41d36eba6 + 0fb1955ea9708d3b8f817dfa193af0edf5dd3991 diff --git a/eng/Versions.props b/eng/Versions.props index 692641741..d4a0c06fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23158.27 - 7.0.300-preview.23158.27 - 7.0.300-preview.23158.27 + 7.0.300-preview.23158.52 + 7.0.300-preview.23158.52 + 7.0.300-preview.23158.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)