From cebd153a5aa5e4a710c2cf36cf08fe7ee746892f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Oct 2022 17:17:48 +0000 Subject: [PATCH 001/864] 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 002/864] 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 003/864] 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 004/864] 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 005/864] 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 006/864] 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 007/864] 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 008/864] 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 009/864] 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 010/864] 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 011/864] 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 012/864] 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 013/864] 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 014/864] 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 015/864] 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 016/864] 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 017/864] 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 018/864] 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 019/864] 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 020/864] 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 67c497aaafe5b68b5a65dd28756c60ffe92a4f36 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 28 Nov 2022 07:48:11 -0500 Subject: [PATCH 021/864] repos/sdk.proj: set NativeAotSupported=false on arm platform --- src/SourceBuild/tarball/content/repos/sdk.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index c18e00dd6..54e90ec3e 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -7,6 +7,9 @@ $(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir) + + $(BuildCommandArgs) /p:NativeAotSupported=false + true $(BuildCommandArgs) -v $(LogVerbosity) From d311a58ee178e4084d570ae5203e22c1e5e174b7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 29 Nov 2022 00:25:16 +0000 Subject: [PATCH 022/864] 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 023/864] [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 024/864] 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 10bec223c582cb2459376b28345ec9ceabcdc371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Dec 2022 05:01:33 +0000 Subject: [PATCH 025/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221206.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.308-servicing.22606.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f93da753d..6ba7b5cd5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,11 @@ - + + @@ -41,14 +43,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67f3f2b42..6cd227c0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 diff --git a/eng/Versions.props b/eng/Versions.props index 9cf40a422..67599e13a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.308-servicing.22601.36 - 6.0.308-servicing.22601.36 + 6.0.308-servicing.22606.14 + 6.0.308-servicing.22606.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32ca4d57eb8cdd354db3ef654bae15ce03fe197a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Dec 2022 00:24:06 +0000 Subject: [PATCH 026/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221213.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.102 --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8ca01d0f3..ec589432c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -20,10 +24,12 @@ - + + + @@ -45,14 +51,18 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b46fb291..feaa9fe29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98720693e228934405de152651b2e21390c3bfec + 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 diff --git a/eng/Versions.props b/eng/Versions.props index fa81db344..620100f4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22607.4 - 7.0.102-servicing.22607.4 + 7.0.102-servicing.22613.13 + 7.0.102-servicing.22613.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e7ba8e171c083fc3f3dff604bd7223b57477e512 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Dec 2022 21:13:48 +0000 Subject: [PATCH 027/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221214.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.102 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22608.27 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec589432c..979af78c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index feaa9fe29..38996737c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 + 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 + 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 + 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0fbfc5cbe4ed8f302b5461b9d4965ba48007e172 + 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - d7a61210a88b584ca0827585ec6e871c6b1c5a14 + af1e46ad38d900023f8b1a2839484e471ece1502 diff --git a/eng/Versions.props b/eng/Versions.props index 620100f4e..fe8ef02be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22613.13 - 7.0.102-servicing.22613.13 + 7.0.102-servicing.22614.3 + 7.0.102-servicing.22614.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f83cf4390d8de31058b1a36a5410d0deb03da176 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Dec 2022 10:36:16 +0000 Subject: [PATCH 028/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221216.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.102 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 979af78c2..0e4549b22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38996737c..ec95cf3b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 + 98eb1e074219329d39600a38d82cd2f17fd33e52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 + 98eb1e074219329d39600a38d82cd2f17fd33e52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 + 98eb1e074219329d39600a38d82cd2f17fd33e52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7ecf3bfdab4ce3654229eb37a09b4c54b356e2c0 + 98eb1e074219329d39600a38d82cd2f17fd33e52 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - af1e46ad38d900023f8b1a2839484e471ece1502 + 3a0201fcb5dc65553b551b7721762d0c2bf73a12 diff --git a/eng/Versions.props b/eng/Versions.props index fe8ef02be..cfaa6505d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22614.3 - 7.0.102-servicing.22614.3 + 7.0.102-servicing.22616.3 + 7.0.102-servicing.22616.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c39a914eccc28173347b7fefba7da4bc3c5b3a1c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Jan 2023 15:11:42 -0800 Subject: [PATCH 029/864] 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 a5d15a2d3e9fb1e70b144e7484364a952bc36325 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 02:31:20 +0000 Subject: [PATCH 030/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230104.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e4549b22..78b784824 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec95cf3b5..ce7ff6ed1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98eb1e074219329d39600a38d82cd2f17fd33e52 + d279c9e19b3ab606eea8840af1124a5ff0ae8d90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98eb1e074219329d39600a38d82cd2f17fd33e52 + d279c9e19b3ab606eea8840af1124a5ff0ae8d90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98eb1e074219329d39600a38d82cd2f17fd33e52 + d279c9e19b3ab606eea8840af1124a5ff0ae8d90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98eb1e074219329d39600a38d82cd2f17fd33e52 + d279c9e19b3ab606eea8840af1124a5ff0ae8d90 diff --git a/eng/Versions.props b/eng/Versions.props index cfaa6505d..3cc8caf8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.102 - 7.0.102-servicing.22616.3 - 7.0.102-servicing.22616.3 + 7.0.103 + 7.0.103-servicing.23054.35 + 7.0.103-servicing.23054.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 904a7bf29009cdb8e0b84d17e6a6989dcc21ead7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 11:30:37 +0000 Subject: [PATCH 031/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 78b784824..895d62ae5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce7ff6ed1..36d8b1238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d279c9e19b3ab606eea8840af1124a5ff0ae8d90 + 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d279c9e19b3ab606eea8840af1124a5ff0ae8d90 + 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d279c9e19b3ab606eea8840af1124a5ff0ae8d90 + 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d279c9e19b3ab606eea8840af1124a5ff0ae8d90 + 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 diff --git a/eng/Versions.props b/eng/Versions.props index 3cc8caf8c..94f6c6676 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23054.35 - 7.0.103-servicing.23054.35 + 7.0.103-servicing.23055.6 + 7.0.103-servicing.23055.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 890975347d27b7bbb4e68a5485831e38681316e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:17:58 +0000 Subject: [PATCH 032/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 895d62ae5..04daf1126 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36d8b1238..394199df0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 + 61acec4bf7cdb89e331f76462c67b47506d4717d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 + 61acec4bf7cdb89e331f76462c67b47506d4717d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 + 61acec4bf7cdb89e331f76462c67b47506d4717d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24c8ae56a5ad09c720a5f9befa7900f2ed03e593 + 61acec4bf7cdb89e331f76462c67b47506d4717d diff --git a/eng/Versions.props b/eng/Versions.props index 94f6c6676..3b57d933f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23055.6 - 7.0.103-servicing.23055.6 + 7.0.103-servicing.23055.12 + 7.0.103-servicing.23055.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a0e84f966f9aad817201a426ea9886e2fe770dba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:27:04 +0000 Subject: [PATCH 033/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23055.16 --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1d3e88ec..e185e9657 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -18,9 +20,13 @@ + + + + @@ -41,15 +47,21 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c57d7b37..f09cd4457 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 97a37eb4afb9da1701a7e5666e16b34e494b646e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a587d5a182150fbefff03d839f383cf68ff0243 + 97a37eb4afb9da1701a7e5666e16b34e494b646e diff --git a/eng/Versions.props b/eng/Versions.props index 3ad91b798..bc613e809 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.405-servicing.22601.33 - 6.0.405-servicing.22601.33 + 6.0.406-servicing.23055.16 + 6.0.406-servicing.23055.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e417a061910ae4e58fac720932411934ddd26d7e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:30:16 +0000 Subject: [PATCH 034/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23055.15 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ba7b5cd5..ce291f905 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -22,6 +23,7 @@ + @@ -44,6 +46,7 @@ + @@ -53,6 +56,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cd227c0e..61cbac664 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 + 17fe98a9b1fe583fddaf7feae353873e323ed87a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 + 17fe98a9b1fe583fddaf7feae353873e323ed87a diff --git a/eng/Versions.props b/eng/Versions.props index 67599e13a..e70e14a62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.308-servicing.22606.14 - 6.0.308-servicing.22606.14 + 6.0.309-servicing.23055.15 + 6.0.309-servicing.23055.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6230481164c5b13e7e9405a4a03602b4f9bce341 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:59:21 +0000 Subject: [PATCH 035/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.113-servicing.22601.32 -> To Version 6.0.114-servicing.23055.18 --- 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 6534504cb..a306c873b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -19,9 +23,13 @@ + + + + @@ -42,6 +50,8 @@ + + @@ -49,9 +59,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca15599a1..203e6ecdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 5942dec60fa9e168e7fd5297f72265605124ea66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 5942dec60fa9e168e7fd5297f72265605124ea66 diff --git a/eng/Versions.props b/eng/Versions.props index 8c37d5e87..92995f1db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.113-servicing.22601.32 - 6.0.113-servicing.22601.32 + 6.0.114-servicing.23055.18 + 6.0.114-servicing.23055.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f2f910e75c96d086e277dd0d9da00ae65bd6cc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 20:26:00 +0000 Subject: [PATCH 036/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 04daf1126..b91544876 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 394199df0..c2340e400 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61acec4bf7cdb89e331f76462c67b47506d4717d + a0d938b819b2d4ead3cb207da320fa0274c1d102 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61acec4bf7cdb89e331f76462c67b47506d4717d + a0d938b819b2d4ead3cb207da320fa0274c1d102 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61acec4bf7cdb89e331f76462c67b47506d4717d + a0d938b819b2d4ead3cb207da320fa0274c1d102 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61acec4bf7cdb89e331f76462c67b47506d4717d + a0d938b819b2d4ead3cb207da320fa0274c1d102 diff --git a/eng/Versions.props b/eng/Versions.props index 3b57d933f..ecd2b335b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23055.12 - 7.0.103-servicing.23055.12 + 7.0.103-servicing.23055.20 + 7.0.103-servicing.23055.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22412b83a588ec923483aabfb542c4c038332ddc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 07:21:02 +0000 Subject: [PATCH 037/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index b91544876..97eed43c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2340e400..9d4140505 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0d938b819b2d4ead3cb207da320fa0274c1d102 + 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0d938b819b2d4ead3cb207da320fa0274c1d102 + 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0d938b819b2d4ead3cb207da320fa0274c1d102 + 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0d938b819b2d4ead3cb207da320fa0274c1d102 + 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a @@ -154,9 +154,9 @@ 9a89d02ff5de19d84190ebed4a6017df4dc19dc4 - + https://github.com/nuget/nuget.client - 125f673fd1cdb3cc012f62aa3ce764d2460b89eb + da5b9fa1595e212914854a9ff4a18a6759ed4729 diff --git a/eng/Versions.props b/eng/Versions.props index ecd2b335b..3deab218a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23055.20 - 7.0.103-servicing.23055.20 + 7.0.103-servicing.23055.41 + 7.0.103-servicing.23055.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7718784e7343ac803e94a1d47b80b7eb15439b6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 08:37:55 +0000 Subject: [PATCH 038/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23055.48 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.1-rc.1 -> To Version 6.3.2-rc.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f09cd4457..3b72aa519 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 97a37eb4afb9da1701a7e5666e16b34e494b646e + deaf3948e95d700244c408a38be344a38839f50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 97a37eb4afb9da1701a7e5666e16b34e494b646e + deaf3948e95d700244c408a38be344a38839f50d @@ -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 bc613e809..79717e176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23055.16 - 6.0.406-servicing.23055.16 + 6.0.406-servicing.23055.48 + 6.0.406-servicing.23055.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f58ac28d8dad0bb1466e989f2018f763c8168073 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 21:05:21 +0000 Subject: [PATCH 039/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23056.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61cbac664..cec84650b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fe98a9b1fe583fddaf7feae353873e323ed87a + a601963a61278b7689b8aaf3ad540e4bdcfcff07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fe98a9b1fe583fddaf7feae353873e323ed87a + a601963a61278b7689b8aaf3ad540e4bdcfcff07 @@ -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 e70e14a62..475daf109 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23055.15 - 6.0.309-servicing.23055.15 + 6.0.309-servicing.23056.14 + 6.0.309-servicing.23056.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c1450fc792efcedc331e1900d086a964ef08bbd6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 22:01:17 +0000 Subject: [PATCH 040/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.113-servicing.22601.32 -> To Version 6.0.114-servicing.23056.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.0.3-rc.1 -> To Version 6.0.4-rc.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 203e6ecdf..79a449437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5942dec60fa9e168e7fd5297f72265605124ea66 + ec574baa3224491fe7ca8941fb5815dc8bf738ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5942dec60fa9e168e7fd5297f72265605124ea66 + ec574baa3224491fe7ca8941fb5815dc8bf738ff @@ -151,9 +151,9 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - c60eee85ec0109bdda894806b167bb4d55f75183 + + https://github.com/nuget/nuget.client + 822425710cec4e49c9344ada58c21c7d3223973b diff --git a/eng/Versions.props b/eng/Versions.props index 92995f1db..2a7c632f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23055.18 - 6.0.114-servicing.23055.18 + 6.0.114-servicing.23056.17 + 6.0.114-servicing.23056.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 172d5933acd3ee6dd0b5be61b02bb882629a603d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 7 Jan 2023 00:38:21 +0000 Subject: [PATCH 041/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23056.26 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- 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 cec84650b..b029f20e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a601963a61278b7689b8aaf3ad540e4bdcfcff07 + d2cf2404b26dc01c9f52b716f936536a8cc01a7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a601963a61278b7689b8aaf3ad540e4bdcfcff07 + d2cf2404b26dc01c9f52b716f936536a8cc01a7b diff --git a/eng/Versions.props b/eng/Versions.props index 475daf109..50e3606c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23056.14 - 6.0.309-servicing.23056.14 + 6.0.309-servicing.23056.26 + 6.0.309-servicing.23056.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e11cb5a772d0a26fc705d566c8577b17dcdaa01 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 18:52:56 +0000 Subject: [PATCH 042/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23059.7 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.1-rc.1 -> To Version 6.3.2-rc.9 (parent: Microsoft.NET.Sdk --- 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 3b72aa519..ccd7d365f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deaf3948e95d700244c408a38be344a38839f50d + b140be3633a1f826fc9b15b8bc3137a6d5aecb6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deaf3948e95d700244c408a38be344a38839f50d + b140be3633a1f826fc9b15b8bc3137a6d5aecb6b diff --git a/eng/Versions.props b/eng/Versions.props index 79717e176..1bf45ad72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23055.48 - 6.0.406-servicing.23055.48 + 6.0.406-servicing.23059.7 + 6.0.406-servicing.23059.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e03d74bf13b332f99d13edac2b4e798af6262352 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 19:49:07 +0000 Subject: [PATCH 043/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23056.17 -> To Version 6.0.114-servicing.23059.12 --- 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 79a449437..c8f4177fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec574baa3224491fe7ca8941fb5815dc8bf738ff + 0bee5cce29cff87875df1e476847d51e8d98f7a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec574baa3224491fe7ca8941fb5815dc8bf738ff + 0bee5cce29cff87875df1e476847d51e8d98f7a8 diff --git a/eng/Versions.props b/eng/Versions.props index 2a7c632f2..aec0f5c5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23056.17 - 6.0.114-servicing.23056.17 + 6.0.114-servicing.23059.12 + 6.0.114-servicing.23059.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d481cdf1c94b6b11e9c9d1dc3b9ec75a2f4110b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 20:07:01 +0000 Subject: [PATCH 044/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23059.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- 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 b029f20e1..08fffe6da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2cf2404b26dc01c9f52b716f936536a8cc01a7b + 41bb21af4043f3ff38dbcb71b281c43209e25468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2cf2404b26dc01c9f52b716f936536a8cc01a7b + 41bb21af4043f3ff38dbcb71b281c43209e25468 diff --git a/eng/Versions.props b/eng/Versions.props index 50e3606c6..58ccee8a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23056.26 - 6.0.309-servicing.23056.26 + 6.0.309-servicing.23059.13 + 6.0.309-servicing.23059.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 070988e6b9b21af619e8724a8f29744be1ab33dd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 20:26:54 +0000 Subject: [PATCH 045/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97eed43c3..60d2c712b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d4140505..8eaf33126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a + 9f37ec84dcc258088fa3a326486917396e050e11 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a + 9f37ec84dcc258088fa3a326486917396e050e11 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a + 9f37ec84dcc258088fa3a326486917396e050e11 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5edc1fd8fe3a7e9ec7812ad3de79083df0ec533a + 9f37ec84dcc258088fa3a326486917396e050e11 diff --git a/eng/Versions.props b/eng/Versions.props index 3deab218a..6014e6c55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23055.41 - 7.0.103-servicing.23055.41 + 7.0.103-servicing.23059.14 + 7.0.103-servicing.23059.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84dc3b63bf94a22f19f5d18fbaeae736d0e7dce4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 21:29:18 +0000 Subject: [PATCH 046/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23056.17 -> To Version 6.0.114-servicing.23059.15 Dependency coherency updates 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.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++-------- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index a306c873b..45a6f9cab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,12 +17,10 @@ - + - - - + @@ -50,18 +46,14 @@ - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8f4177fa..a8d5ffdb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bee5cce29cff87875df1e476847d51e8d98f7a8 + 87d31f267ed4d8548b5b5744b97732bd06f4ee90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bee5cce29cff87875df1e476847d51e8d98f7a8 + 87d31f267ed4d8548b5b5744b97732bd06f4ee90 diff --git a/eng/Versions.props b/eng/Versions.props index aec0f5c5e..2ad738733 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 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.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 0.2.0 - 6.0.114-servicing.23059.12 - 6.0.114-servicing.23059.12 + 6.0.114-servicing.23059.15 + 6.0.114-servicing.23059.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,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 + 6.0.14-servicing.23056.8 + 6.0.14-servicing.23056.8 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.113 + 6.0.114 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 06cd8082c3c4b8b2adf975213fb0441062663386 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 21:56:13 +0000 Subject: [PATCH 047/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.405-servicing.22601.33 -> To Version 6.0.406-servicing.23059.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.1-rc.1 -> To Version 6.3.2-rc.9 (parent: Microsoft.NET.Sdk --- 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 ccd7d365f..8d6d123ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b140be3633a1f826fc9b15b8bc3137a6d5aecb6b + 46a2bcbab5cb79b9993e29116998b1ecb054ff91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b140be3633a1f826fc9b15b8bc3137a6d5aecb6b + 46a2bcbab5cb79b9993e29116998b1ecb054ff91 diff --git a/eng/Versions.props b/eng/Versions.props index 1bf45ad72..324e421de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23059.7 - 6.0.406-servicing.23059.7 + 6.0.406-servicing.23059.17 + 6.0.406-servicing.23059.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48faeab6f17e8f13b897e5f21d3c56aea530fa54 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 02:00:03 +0000 Subject: [PATCH 048/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23059.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++-------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce291f905..323d67cf1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,20 @@ - - - + - + - + - - - + @@ -45,19 +41,15 @@ - - - + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08fffe6da..3ca411ef0 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 + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41bb21af4043f3ff38dbcb71b281c43209e25468 + be3d8e9b00d2f16c32fc89b5316987e23642b027 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41bb21af4043f3ff38dbcb71b281c43209e25468 + be3d8e9b00d2f16c32fc89b5316987e23642b027 diff --git a/eng/Versions.props b/eng/Versions.props index a2ea1f623..061bdeeed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 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.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 0.2.0 - 6.0.309-servicing.23059.13 - 6.0.309-servicing.23059.13 + 6.0.309-servicing.23059.27 + 6.0.309-servicing.23059.27 $(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.23056.8 + 6.0.14-servicing.23056.8 + 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.23059.3 + 6.0.14-servicing.23059.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.308 + 6.0.309 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ccb1de1825704799ecdaa8eea98cd6ee2642fe34 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 10:17:54 +0000 Subject: [PATCH 049/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 3ca411ef0..6aa39efeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be3d8e9b00d2f16c32fc89b5316987e23642b027 + 2a6be3c1062c59c8518de6f903fb624f1b643d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be3d8e9b00d2f16c32fc89b5316987e23642b027 + 2a6be3c1062c59c8518de6f903fb624f1b643d56 diff --git a/eng/Versions.props b/eng/Versions.props index 061bdeeed..59651d34d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23059.27 - 6.0.309-servicing.23059.27 + 6.0.309-servicing.23060.4 + 6.0.309-servicing.23060.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3cda9235ed483273ffdb8cd757c9556ba28eb245 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 18:50:39 +0000 Subject: [PATCH 050/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23060.9 --- 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 a8d5ffdb8..5d692c16a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 87d31f267ed4d8548b5b5744b97732bd06f4ee90 + 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 87d31f267ed4d8548b5b5744b97732bd06f4ee90 + 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 diff --git a/eng/Versions.props b/eng/Versions.props index 2ad738733..5d2c211bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23059.15 - 6.0.114-servicing.23059.15 + 6.0.114-servicing.23060.9 + 6.0.114-servicing.23060.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60a8b19bee009491d23fe685c0fcb04c88dd2ee9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 22:50:37 +0000 Subject: [PATCH 051/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 6aa39efeb..bddb23236 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a6be3c1062c59c8518de6f903fb624f1b643d56 + 53bb7252f25bf09920e5e168f099b580cc6919f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a6be3c1062c59c8518de6f903fb624f1b643d56 + 53bb7252f25bf09920e5e168f099b580cc6919f3 diff --git a/eng/Versions.props b/eng/Versions.props index 59651d34d..4572933fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.4 - 6.0.309-servicing.23060.4 + 6.0.309-servicing.23060.22 + 6.0.309-servicing.23060.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7803a43d0fc987a7bc6d755a3f77b3ec290b1e9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 22:55:54 +0000 Subject: [PATCH 052/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23059.17 -> To Version 6.0.406-servicing.23060.23 --- 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 8d6d123ca..0e8ee9001 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46a2bcbab5cb79b9993e29116998b1ecb054ff91 + bf6f90878676dfb0762492f3d96a5f0cf4d4a244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46a2bcbab5cb79b9993e29116998b1ecb054ff91 + bf6f90878676dfb0762492f3d96a5f0cf4d4a244 diff --git a/eng/Versions.props b/eng/Versions.props index 324e421de..685032514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23059.17 - 6.0.406-servicing.23059.17 + 6.0.406-servicing.23060.23 + 6.0.406-servicing.23060.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8429945e1c44a75ab085ec70d7ef6529f9370e86 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Jan 2023 15:49:09 -0800 Subject: [PATCH 053/864] [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 f1d912b306aadb1e6e3c2c78a112bfb591acb792 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 01:41:10 +0000 Subject: [PATCH 054/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23060.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++------ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45a6f9cab..9a705d78a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,9 +23,7 @@ - - - + @@ -56,9 +54,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d692c16a..940746d41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 + 694cadf9950841c4715b9367e3b90d4e1ac005a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 + 694cadf9950841c4715b9367e3b90d4e1ac005a7 diff --git a/eng/Versions.props b/eng/Versions.props index 5d2c211bd..f133c7183 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23060.9 - 6.0.114-servicing.23060.9 + 6.0.114-servicing.23060.27 + 6.0.114-servicing.23060.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23060.8 + 6.0.14-servicing.23060.8 + 6.0.14 + 6.0.14 From e3198ac87875523e4391dd39df84b05b3a287f45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 01:41:36 +0000 Subject: [PATCH 055/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 323d67cf1..3faa47218 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 bddb23236..6576f6cde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53bb7252f25bf09920e5e168f099b580cc6919f3 + 1cf711fc9948e46181db8c649a253b8f623c6c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53bb7252f25bf09920e5e168f099b580cc6919f3 + 1cf711fc9948e46181db8c649a253b8f623c6c99 diff --git a/eng/Versions.props b/eng/Versions.props index 4572933fe..9b4a4d72d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.22 - 6.0.309-servicing.23060.22 + 6.0.309-servicing.23060.26 + 6.0.309-servicing.23060.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23059.3 - 6.0.14-servicing.23059.3 + 6.0.14-servicing.23060.8 + 6.0.14-servicing.23060.8 6.0.14 6.0.14 From bd560c838607fc408341a9926bbe9d048599dd49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 07:29:56 +0000 Subject: [PATCH 056/864] Update dependencies from https://github.com/dotnet/sdk build 20230110.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23060.29 --- 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 0b07a18f4..7c8510771 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 diff --git a/eng/Versions.props b/eng/Versions.props index ab98126a4..c9ff714f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.200-preview.23060.29 + 7.0.200-preview.23060.29 + 7.0.200-preview.23060.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e78bc126266b514403a56a4443264efb05f25746 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 11:05:36 +0000 Subject: [PATCH 057/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23061.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 6576f6cde..b1b8937f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1cf711fc9948e46181db8c649a253b8f623c6c99 + 35d6bc1e3057789e828f15ddf7b73242d93f093e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1cf711fc9948e46181db8c649a253b8f623c6c99 + 35d6bc1e3057789e828f15ddf7b73242d93f093e diff --git a/eng/Versions.props b/eng/Versions.props index 9b4a4d72d..69e04fa36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.26 - 6.0.309-servicing.23060.26 + 6.0.309-servicing.23061.3 + 6.0.309-servicing.23061.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c440b14c6b6fd3615d0a405f1c015ffa30fb8779 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 14:04:00 +0000 Subject: [PATCH 058/864] Update dependencies from https://github.com/dotnet/sdk build 20230111.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.6 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-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 7c8510771..0c81aa436 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e - + https://github.com/dotnet/sdk - d3f34d91885bd5f8e9aa3fba157fbe19909c80f4 + 3775f55d55278c31dff6303dbc21675c8974415e @@ -149,9 +149,9 @@ 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a diff --git a/eng/Versions.props b/eng/Versions.props index c9ff714f8..d17412fa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.29 - 7.0.200-preview.23060.29 - 7.0.200-preview.23060.29 + 7.0.200-preview.23061.6 + 7.0.200-preview.23061.6 + 7.0.200-preview.23061.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) 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 059/864] .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 2ea1e293fc6775b510818c10cd171e395496a46c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 19:18:25 +0000 Subject: [PATCH 060/864] Update dependencies from https://github.com/dotnet/sdk build 20230111.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.14 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 0c81aa436..b8a0a8695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 - + https://github.com/dotnet/sdk - 3775f55d55278c31dff6303dbc21675c8974415e + c2bd68458f383e37fe68edf269f4364c63d08de1 diff --git a/eng/Versions.props b/eng/Versions.props index d17412fa4..0a706cabd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.6 - 7.0.200-preview.23061.6 - 7.0.200-preview.23061.6 + 7.0.200-preview.23061.14 + 7.0.200-preview.23061.14 + 7.0.200-preview.23061.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d625ce4fb014d3d6e0d854076359a89fc86230b5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 11 Jan 2023 15:34:43 -0600 Subject: [PATCH 061/864] 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 062/864] [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 47b329f8f9d6bdf0e30e0edead74e8c4e11c672a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 23:20:08 +0000 Subject: [PATCH 063/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23059.17 -> To Version 6.0.406-servicing.23061.27 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index e185e9657..cfdcd77c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,12 @@ - - - - @@ -47,12 +43,8 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e8ee9001..f76b6837d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6f90878676dfb0762492f3d96a5f0cf4d4a244 + 20354d1d140236af48ddcb4d0dbacbf6088df45d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf6f90878676dfb0762492f3d96a5f0cf4d4a244 + 20354d1d140236af48ddcb4d0dbacbf6088df45d diff --git a/eng/Versions.props b/eng/Versions.props index 685032514..85a7e801d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23060.23 - 6.0.406-servicing.23060.23 + 6.0.406-servicing.23061.27 + 6.0.406-servicing.23061.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f9524b68f8a9205ba9bd9df85a21a566f0f664d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 23:26:45 +0000 Subject: [PATCH 064/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23061.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 940746d41..ce30dbcd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 694cadf9950841c4715b9367e3b90d4e1ac005a7 + f742606f3f2d608593cdd26bd478a42d3c96f827 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 694cadf9950841c4715b9367e3b90d4e1ac005a7 + f742606f3f2d608593cdd26bd478a42d3c96f827 diff --git a/eng/Versions.props b/eng/Versions.props index f133c7183..1af1db457 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23060.27 - 6.0.114-servicing.23060.27 + 6.0.114-servicing.23061.28 + 6.0.114-servicing.23061.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9f24b7ea5be980b02869b3e432ebc91eecbfa2a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 23:29:37 +0000 Subject: [PATCH 065/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60d2c712b..6b4d573e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -24,7 +21,7 @@ - + @@ -51,14 +48,11 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8eaf33126..2d94718b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f37ec84dcc258088fa3a326486917396e050e11 + 4053b633a8c513d1a806b19ff78a0ea0a73a117b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f37ec84dcc258088fa3a326486917396e050e11 + 4053b633a8c513d1a806b19ff78a0ea0a73a117b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f37ec84dcc258088fa3a326486917396e050e11 + 4053b633a8c513d1a806b19ff78a0ea0a73a117b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f37ec84dcc258088fa3a326486917396e050e11 + 4053b633a8c513d1a806b19ff78a0ea0a73a117b diff --git a/eng/Versions.props b/eng/Versions.props index 6014e6c55..fcaf9dc9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23059.14 - 7.0.103-servicing.23059.14 + 7.0.103-servicing.23061.26 + 7.0.103-servicing.23061.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c4d12dc907f5b439660ff5c3f5ffe157d675fa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 02:58:39 +0000 Subject: [PATCH 066/864] Update dependencies from https://github.com/dotnet/sdk build 20230111.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.33 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 b8a0a8695..dc0e5b652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 - + https://github.com/dotnet/sdk - c2bd68458f383e37fe68edf269f4364c63d08de1 + ca0e775a64eb7542710d72aea1439528be1a6a03 diff --git a/eng/Versions.props b/eng/Versions.props index 0a706cabd..6da7deb96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.14 - 7.0.200-preview.23061.14 - 7.0.200-preview.23061.14 + 7.0.200-preview.23061.33 + 7.0.200-preview.23061.33 + 7.0.200-preview.23061.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1505b38f4f5e7af519f45f67e4e42892daf49f69 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jan 2023 03:00:36 +0000 Subject: [PATCH 067/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b4d573e4..d7d4ab382 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,9 @@ - - + @@ -50,9 +49,8 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d94718b8..cd7c3e640 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4053b633a8c513d1a806b19ff78a0ea0a73a117b + 22d144a429e563ab979baa7a1c2eb71c09e58949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4053b633a8c513d1a806b19ff78a0ea0a73a117b + 22d144a429e563ab979baa7a1c2eb71c09e58949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4053b633a8c513d1a806b19ff78a0ea0a73a117b + 22d144a429e563ab979baa7a1c2eb71c09e58949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4053b633a8c513d1a806b19ff78a0ea0a73a117b + 22d144a429e563ab979baa7a1c2eb71c09e58949 diff --git a/eng/Versions.props b/eng/Versions.props index fcaf9dc9e..1e7263580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23061.26 - 7.0.103-servicing.23061.26 + 7.0.103-servicing.23061.34 + 7.0.103-servicing.23061.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cb8e7a5a471eeb97d70ba630d96a1599b82e3071 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jan 2023 04:14:28 +0000 Subject: [PATCH 068/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23061.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 ce30dbcd9..420bf5238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f742606f3f2d608593cdd26bd478a42d3c96f827 + f6b4f0b7231fcde3c66a526fdad80760cc52e74c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f742606f3f2d608593cdd26bd478a42d3c96f827 + f6b4f0b7231fcde3c66a526fdad80760cc52e74c diff --git a/eng/Versions.props b/eng/Versions.props index 1af1db457..04eb9b89d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23061.28 - 6.0.114-servicing.23061.28 + 6.0.114-servicing.23061.39 + 6.0.114-servicing.23061.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b891269556e9e6fa4de1c2d2b4b5ced1156aadce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 05:00:50 +0000 Subject: [PATCH 069/864] Update dependencies from https://github.com/dotnet/sdk build 20230111.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.40 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 dc0e5b652..b1e919104 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 - + https://github.com/dotnet/sdk - ca0e775a64eb7542710d72aea1439528be1a6a03 + ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 diff --git a/eng/Versions.props b/eng/Versions.props index 6da7deb96..b3cc36385 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.33 - 7.0.200-preview.23061.33 - 7.0.200-preview.23061.33 + 7.0.200-preview.23061.40 + 7.0.200-preview.23061.40 + 7.0.200-preview.23061.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28146be68894156c9c29769615f5e2387fe77525 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jan 2023 07:04:01 +0000 Subject: [PATCH 070/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23059.17 -> To Version 6.0.406-servicing.23061.43 --- NuGet.config | 12 ------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfdcd77c2..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,14 +15,8 @@ - - - - - - @@ -47,14 +41,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f76b6837d..64dda4212 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bdb29b3dc96302426de3433e38b150c90f1c8af6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20354d1d140236af48ddcb4d0dbacbf6088df45d + c462aca4006d7a7b19385497e7c24d1baa9e8c1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 20354d1d140236af48ddcb4d0dbacbf6088df45d + c462aca4006d7a7b19385497e7c24d1baa9e8c1a diff --git a/eng/Versions.props b/eng/Versions.props index 85a7e801d..95040c524 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23061.27 - 6.0.406-servicing.23061.27 + 6.0.406-servicing.23061.43 + 6.0.406-servicing.23061.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ace0008ecaca153d9fe5bf4582b8e6cfbfff33b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 08:15:42 +0000 Subject: [PATCH 071/864] Update dependencies from https://github.com/dotnet/sdk build 20230111.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23061.44 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 b1e919104..da9fca008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 - + https://github.com/dotnet/sdk - ede971fe3d801f84bf1fc7fd9c9724de6ccf6b34 + 03336daeccdb35c6ff09384e00ad4cc3e49b8323 diff --git a/eng/Versions.props b/eng/Versions.props index b3cc36385..1a72807f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.40 - 7.0.200-preview.23061.40 - 7.0.200-preview.23061.40 + 7.0.200-preview.23061.44 + 7.0.200-preview.23061.44 + 7.0.200-preview.23061.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e216c822d42f6bfa3c0454160a90be9112abd5c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 17:45:18 +0000 Subject: [PATCH 072/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.3 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 da9fca008..5c027e560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 - + https://github.com/dotnet/sdk - 03336daeccdb35c6ff09384e00ad4cc3e49b8323 + bbc0390753596357eb32e64d286c2e13c7db9b10 diff --git a/eng/Versions.props b/eng/Versions.props index 1a72807f6..f5857d80f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23061.44 - 7.0.200-preview.23061.44 - 7.0.200-preview.23061.44 + 7.0.200-preview.23062.3 + 7.0.200-preview.23062.3 + 7.0.200-preview.23062.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e441d9346cde48a3c66d1f350400673a95279490 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 19:04:08 +0000 Subject: [PATCH 073/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.5 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 5c027e560..f45181138 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 - + https://github.com/dotnet/sdk - bbc0390753596357eb32e64d286c2e13c7db9b10 + 66df4df0bb20880b8b05c2561f2c359bd51adbd4 diff --git a/eng/Versions.props b/eng/Versions.props index f5857d80f..21402f4d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.3 - 7.0.200-preview.23062.3 - 7.0.200-preview.23062.3 + 7.0.200-preview.23062.5 + 7.0.200-preview.23062.5 + 7.0.200-preview.23062.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc4e6b95b00a68c21a0ea932c3d3ae04c8372685 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jan 2023 19:27:56 +0000 Subject: [PATCH 074/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7d4ab382..167d1b7cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - @@ -20,12 +16,9 @@ - + - - - @@ -50,12 +43,9 @@ - + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd7c3e640..35af91945 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22d144a429e563ab979baa7a1c2eb71c09e58949 + 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22d144a429e563ab979baa7a1c2eb71c09e58949 + 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22d144a429e563ab979baa7a1c2eb71c09e58949 + 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22d144a429e563ab979baa7a1c2eb71c09e58949 + 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da @@ -138,9 +138,9 @@ c02ece877c62577810f893c44279ce79af820112 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker diff --git a/eng/Versions.props b/eng/Versions.props index 1e7263580..b4a04d5f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23061.34 - 7.0.103-servicing.23061.34 + 7.0.103-servicing.23062.7 + 7.0.103-servicing.23062.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab538d4fd200cd7280ee85b02670c7fceb1ddaae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 21:20:30 +0000 Subject: [PATCH 075/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.9 Dependency coherency updates Microsoft.Build From Version 17.5.0-preview-23059-01 -> To Version 17.5.0-preview-23061-01 (parent: Microsoft.NET.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 f45181138..891161048 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be - + https://github.com/dotnet/sdk - 66df4df0bb20880b8b05c2561f2c359bd51adbd4 + 21eb0272e92284189614cb2a9cf7315503d062be diff --git a/eng/Versions.props b/eng/Versions.props index 21402f4d1..b7e6615a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.5 - 7.0.200-preview.23062.5 - 7.0.200-preview.23062.5 + 7.0.200-preview.23062.9 + 7.0.200-preview.23062.9 + 7.0.200-preview.23062.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82f25c9509c452db9f269ca5e15a1d661bb8dea8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 22:40:38 +0000 Subject: [PATCH 076/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (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 891161048..7f2b1bb9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 - + https://github.com/dotnet/sdk - 21eb0272e92284189614cb2a9cf7315503d062be + 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 @@ -138,9 +138,9 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker diff --git a/eng/Versions.props b/eng/Versions.props index b7e6615a3..f752fe129 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.9 - 7.0.200-preview.23062.9 - 7.0.200-preview.23062.9 + 7.0.200-preview.23062.10 + 7.0.200-preview.23062.10 + 7.0.200-preview.23062.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1eb3d97259a71cdeddaf8c756ed508a8e7316203 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jan 2023 23:57:00 +0000 Subject: [PATCH 077/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.16 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.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 7f2b1bb9e..497bc78ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 - + https://github.com/dotnet/sdk - 7c886e45fcbed8c9d4b76fd5d0bfe1361eb97034 + 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 diff --git a/eng/Versions.props b/eng/Versions.props index f752fe129..9bbe7bcb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.10 - 7.0.200-preview.23062.10 - 7.0.200-preview.23062.10 + 7.0.200-preview.23062.16 + 7.0.200-preview.23062.16 + 7.0.200-preview.23062.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6f80c92c911395a353ddeebbd778c584cd22bd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 05:11:31 +0000 Subject: [PATCH 078/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.25 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.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 497bc78ad..cce8b62d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b - + https://github.com/dotnet/sdk - 52b9653616e703c2738afbd5e8cc2a7dd17aaad8 + 28ad007682ca03e88375a4e85465e18bb365fe5b diff --git a/eng/Versions.props b/eng/Versions.props index 9bbe7bcb4..8698406fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.16 - 7.0.200-preview.23062.16 - 7.0.200-preview.23062.16 + 7.0.200-preview.23062.25 + 7.0.200-preview.23062.25 + 7.0.200-preview.23062.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 060487b8e5ff037cdb2b37a68ffd0ac08e6c8c69 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jan 2023 05:17:16 +0000 Subject: [PATCH 079/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 167d1b7cd..bda7518f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35af91945..3c57219eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da + a194b8a39aa679ada39a5b3084c5952e52855336 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da + a194b8a39aa679ada39a5b3084c5952e52855336 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da + a194b8a39aa679ada39a5b3084c5952e52855336 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4adcac8d38dc70cabe14acbfa4b5f2fb2434f7da + a194b8a39aa679ada39a5b3084c5952e52855336 @@ -144,7 +144,7 @@ linker - + https://github.com/dotnet/roslyn 3a0201fcb5dc65553b551b7721762d0c2bf73a12 diff --git a/eng/Versions.props b/eng/Versions.props index b4a04d5f3..34a436d04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23062.7 - 7.0.103-servicing.23062.7 + 7.0.103-servicing.23062.23 + 7.0.103-servicing.23062.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8533df67aeb9f98288418ef3bc6ac661a01fb386 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jan 2023 07:01:02 +0000 Subject: [PATCH 080/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index bda7518f0..1c7ef4ced 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c57219eb..33aedc616 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a194b8a39aa679ada39a5b3084c5952e52855336 + c47ddbd34741437146ea8ed093aa7907e678a5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a194b8a39aa679ada39a5b3084c5952e52855336 + c47ddbd34741437146ea8ed093aa7907e678a5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a194b8a39aa679ada39a5b3084c5952e52855336 + c47ddbd34741437146ea8ed093aa7907e678a5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a194b8a39aa679ada39a5b3084c5952e52855336 + c47ddbd34741437146ea8ed093aa7907e678a5af diff --git a/eng/Versions.props b/eng/Versions.props index 34a436d04..96ffab03d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23062.23 - 7.0.103-servicing.23062.23 + 7.0.103-servicing.23062.31 + 7.0.103-servicing.23062.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2540b41dc93c6f0d5d8c69021e5934ff92b97a58 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jan 2023 08:28:03 +0000 Subject: [PATCH 081/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1c7ef4ced..fed915364 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33aedc616..a5838ee94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c47ddbd34741437146ea8ed093aa7907e678a5af + 29d9af0d133720ea0a283cd5755e46bc35b4e17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c47ddbd34741437146ea8ed093aa7907e678a5af + 29d9af0d133720ea0a283cd5755e46bc35b4e17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c47ddbd34741437146ea8ed093aa7907e678a5af + 29d9af0d133720ea0a283cd5755e46bc35b4e17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c47ddbd34741437146ea8ed093aa7907e678a5af + 29d9af0d133720ea0a283cd5755e46bc35b4e17c @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 3a0201fcb5dc65553b551b7721762d0c2bf73a12 + 9016ffa65cdfaec92a7e80d8887f023be89d7270 diff --git a/eng/Versions.props b/eng/Versions.props index 96ffab03d..16ec2dbe1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23062.31 - 7.0.103-servicing.23062.31 + 7.0.103-servicing.23062.33 + 7.0.103-servicing.23062.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e61ed353ea9af93d88207d43e66f903159022b38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 10:19:56 +0000 Subject: [PATCH 082/864] Update dependencies from https://github.com/dotnet/sdk build 20230112.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23062.35 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (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 cce8b62d6..55bce1024 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 - + https://github.com/dotnet/sdk - 28ad007682ca03e88375a4e85465e18bb365fe5b + db99dbac0861ce9aeced6182d5ca62cecbce3e78 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf diff --git a/eng/Versions.props b/eng/Versions.props index 8698406fb..0935a692f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.25 - 7.0.200-preview.23062.25 - 7.0.200-preview.23062.25 + 7.0.200-preview.23062.35 + 7.0.200-preview.23062.35 + 7.0.200-preview.23062.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90a0a9becefb3c3e05f4ff2910b906b0242b345d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 11:46:11 +0000 Subject: [PATCH 083/864] Update dependencies from https://github.com/dotnet/sdk build 20230113.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23063.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.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 55bce1024..1c004b66f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 - + https://github.com/dotnet/sdk - db99dbac0861ce9aeced6182d5ca62cecbce3e78 + 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 diff --git a/eng/Versions.props b/eng/Versions.props index 0935a692f..836a41d7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23062.35 - 7.0.200-preview.23062.35 - 7.0.200-preview.23062.35 + 7.0.200-preview.23063.2 + 7.0.200-preview.23063.2 + 7.0.200-preview.23063.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87d18781bc811664ede0aa0f28918ec47ae92257 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 13 Jan 2023 15:22:57 +0000 Subject: [PATCH 084/864] Update sdk version used to build source-build --- src/SourceBuild/tarball/content/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1bf480e4e..01432c896 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "7.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b8e7c828f7439a4ca7783425675bab33cf90e238 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jan 2023 18:04:03 +0000 Subject: [PATCH 085/864] Update dependencies from https://github.com/dotnet/sdk build 20230113.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.200-preview.23063.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.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 1c004b66f..3eadeab0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://github.com/dotnet/sdk - 98117c0013fd1f76c7bac5a3111eaac3b5e1aec0 + 9acbc4db3fa18e9839189580622be7258f81c9d5 diff --git a/eng/Versions.props b/eng/Versions.props index 836a41d7d..79b8fe7f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23063.2 - 7.0.200-preview.23063.2 - 7.0.200-preview.23063.2 + 7.0.200-preview.23063.9 + 7.0.200-preview.23063.9 + 7.0.200-preview.23063.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db04b8f9f4466f905fc7d2e91f83ac7a3e5bd13b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jan 2023 18:36:08 +0000 Subject: [PATCH 086/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230113.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index fed915364..d4a771351 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5838ee94..c9b807c5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d9af0d133720ea0a283cd5755e46bc35b4e17c + f44a6149814b280245d4f8b73d89675d2480f9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d9af0d133720ea0a283cd5755e46bc35b4e17c + f44a6149814b280245d4f8b73d89675d2480f9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d9af0d133720ea0a283cd5755e46bc35b4e17c + f44a6149814b280245d4f8b73d89675d2480f9f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29d9af0d133720ea0a283cd5755e46bc35b4e17c + f44a6149814b280245d4f8b73d89675d2480f9f5 diff --git a/eng/Versions.props b/eng/Versions.props index 16ec2dbe1..4c095a696 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23062.33 - 7.0.103-servicing.23062.33 + 7.0.103-servicing.23063.11 + 7.0.103-servicing.23063.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55be7a1a68f6890836eb0b85b0a39a0eeb1c5b4f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:43:08 -0800 Subject: [PATCH 087/864] Stable branding for 7.0.2xx GA --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153..9b5a4f514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,13 +10,13 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + rtm $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 8fd65d532ef21cac4c66b2c6edde7fdfa9dff1ac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:44:57 -0800 Subject: [PATCH 088/864] Update implicit versions --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 14f9bc796..391078d3c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 12 + $([MSBuild]::Add($(VersionFeature), 14)) From 067f0fc228989cab9ab1fae46e3beb841c8c7d28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jan 2023 00:45:09 +0000 Subject: [PATCH 089/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230113.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22608.2 -> To Version 7.0.0-alpha.1.23063.1 --- NuGet.config | 10 ---------- eng/Version.Details.xml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8ca01d0f3..0f076a132 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,17 @@ - - - - - - @@ -45,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bb541249..259ae5e94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,7 +207,7 @@ https://github.com/dotnet/arcade ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/source-build-reference-packages 9964206e0dd215eee4ed199b9041a94e16ba4c45 From 1b003439d3000f8e727c907c9a25daed11719e74 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 14 Jan 2023 05:01:17 +0000 Subject: [PATCH 090/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230113.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23063.31 --- NuGet.config | 3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a705d78a..ba290bb3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 420bf5238..5b4980ff0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6b4f0b7231fcde3c66a526fdad80760cc52e74c + 4e7199aefecf8653ee05202029c629ae00ce1ddd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6b4f0b7231fcde3c66a526fdad80760cc52e74c + 4e7199aefecf8653ee05202029c629ae00ce1ddd diff --git a/eng/Versions.props b/eng/Versions.props index 8a8b2f33f..f23bb7239 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23061.39 - 6.0.114-servicing.23061.39 + 6.0.114-servicing.23063.31 + 6.0.114-servicing.23063.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 75c31204d83947236589a4605a65f0903c8befcb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Jan 2023 04:35:11 +0000 Subject: [PATCH 091/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230115.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4a771351..cff08c2d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9b807c5d..701568040 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44a6149814b280245d4f8b73d89675d2480f9f5 + 55499f1b51b1c3de04319122bc6e6175060bd739 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44a6149814b280245d4f8b73d89675d2480f9f5 + 55499f1b51b1c3de04319122bc6e6175060bd739 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44a6149814b280245d4f8b73d89675d2480f9f5 + 55499f1b51b1c3de04319122bc6e6175060bd739 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44a6149814b280245d4f8b73d89675d2480f9f5 + 55499f1b51b1c3de04319122bc6e6175060bd739 diff --git a/eng/Versions.props b/eng/Versions.props index 4c095a696..86bcc5a52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23063.11 - 7.0.103-servicing.23063.11 + 7.0.103-servicing.23065.4 + 7.0.103-servicing.23065.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e9b4726e0c3b5f1026c659b1b216f053b4f53bbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Jan 2023 08:14:49 +0000 Subject: [PATCH 092/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230115.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index cff08c2d9..d2de7879f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 701568040..849107fc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55499f1b51b1c3de04319122bc6e6175060bd739 + a0171afe28af3ec1334b58335f73e699aeae682a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55499f1b51b1c3de04319122bc6e6175060bd739 + a0171afe28af3ec1334b58335f73e699aeae682a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55499f1b51b1c3de04319122bc6e6175060bd739 + a0171afe28af3ec1334b58335f73e699aeae682a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 55499f1b51b1c3de04319122bc6e6175060bd739 + a0171afe28af3ec1334b58335f73e699aeae682a @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 9016ffa65cdfaec92a7e80d8887f023be89d7270 + da2ab184d2f9e12f85284039a4f442ca0b499de0 diff --git a/eng/Versions.props b/eng/Versions.props index 86bcc5a52..ae414b521 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23065.4 - 7.0.103-servicing.23065.4 + 7.0.103-servicing.23065.7 + 7.0.103-servicing.23065.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b6530bdf354b603033d0e0b06ef9e34cc7d890ce Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 17 Jan 2023 13:40:03 -0800 Subject: [PATCH 093/864] Disable source-build tarball build in CI --- .vsts-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..266784afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml From 1802f4164f9778a41439ae3cc016eb9fa772e42f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jan 2023 22:46:46 +0000 Subject: [PATCH 094/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23061.3 -> To Version 6.0.309-servicing.23067.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.14 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3faa47218..2268fdc45 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 55e4c7afd..7b0d78ab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35d6bc1e3057789e828f15ddf7b73242d93f093e + 906e24ca802a74b64e2a4e3951ef2e8736a12f7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35d6bc1e3057789e828f15ddf7b73242d93f093e + 906e24ca802a74b64e2a4e3951ef2e8736a12f7c diff --git a/eng/Versions.props b/eng/Versions.props index b99544222..cbac3b8db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 0.2.0 - 6.0.309-servicing.23061.3 - 6.0.309-servicing.23061.3 + 6.0.309-servicing.23067.13 + 6.0.309-servicing.23067.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23056.8 - 6.0.14-servicing.23056.8 + 6.0.14-servicing.23063.9 + 6.0.14-servicing.23063.9 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23060.8 - 6.0.14-servicing.23060.8 + 6.0.14-servicing.23061.5 + 6.0.14-servicing.23061.5 6.0.14 6.0.14 From 4192499940b50c28e93fe5db77f5323d98da1134 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:52:01 -0800 Subject: [PATCH 095/864] .NET Source-Build 7.0.102 January 2023 Updates (#15251) Co-authored-by: Chris Rummel Co-authored-by: Michael Simons --- eng/Versions.props | 2 +- .../job/source-build-run-tarball-build.yml | 10 +-- .../tarball/content/Directory.Build.props | 4 ++ .../bootstrap/OverrideBootstrapVersions.props | 4 ++ .../buildBootstrapPreviouslySB.csproj | 70 +++++++++++++------ src/SourceBuild/tarball/content/global.json | 2 +- .../source-build-reference-packages.proj | 2 + 7 files changed, 66 insertions(+), 28 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7fb285690..c5ab2374a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +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.100 + 7.0.102-4 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 06bfd2b15..5459e8415 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 @@ -36,32 +36,32 @@ jobs: installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: CentOSStream8-Online: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true CentOSStream8-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream9-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false Fedora36-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.fedora36Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.ubuntu2004Container }} _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 8880b5d05..6ca72bb7a 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -236,6 +236,10 @@ + + + + diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props index d0a05029f..ced02e960 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -7,5 +7,9 @@ $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) + + 7.0.0 + 7.0.0 + 7.0.0 diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index a22d70373..4f2bbd079 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -13,36 +13,40 @@ - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -73,6 +77,30 @@ Targets="CopyDownloadedPackage" Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" /> + + + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1bf480e4e..01432c896 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "7.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", 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 c1321e716..9f7c3853c 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -16,6 +16,8 @@ true + + NU1504 From 15d6321061da7269fbb999ee8398ba66684e2d57 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 00:37:20 +0000 Subject: [PATCH 096/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 11 ++++- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 3 files changed, 75 insertions(+), 68 deletions(-) diff --git a/NuGet.config b/NuGet.config index d2de7879f..3f9b465db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,22 @@ + + + - + + @@ -40,12 +44,15 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 849107fc7..c493a89c2 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 + 8731b132bcaa909bdbc60b71ce461135a2e23f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 8731b132bcaa909bdbc60b71ce461135a2e23f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 8731b132bcaa909bdbc60b71ce461135a2e23f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 8731b132bcaa909bdbc60b71ce461135a2e23f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + de2e2285d8f4bb9140707297f86f67a35670a803 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + de2e2285d8f4bb9140707297f86f67a35670a803 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + de2e2285d8f4bb9140707297f86f67a35670a803 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + de2e2285d8f4bb9140707297f86f67a35670a803 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + de2e2285d8f4bb9140707297f86f67a35670a803 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + de2e2285d8f4bb9140707297f86f67a35670a803 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0171afe28af3ec1334b58335f73e699aeae682a + c5de40e185ef97f25c7288ac3832912427cb0aa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0171afe28af3ec1334b58335f73e699aeae682a + c5de40e185ef97f25c7288ac3832912427cb0aa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0171afe28af3ec1334b58335f73e699aeae682a + c5de40e185ef97f25c7288ac3832912427cb0aa6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a0171afe28af3ec1334b58335f73e699aeae682a + c5de40e185ef97f25c7288ac3832912427cb0aa6 @@ -163,13 +163,13 @@ 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 ae414b521..a1968dcd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,13 +50,13 @@ - 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.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 0.2.0 @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23065.7 - 7.0.103-servicing.23065.7 + 7.0.103-servicing.23067.14 + 7.0.103-servicing.23067.14 $(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.23063.10 + 7.0.3-servicing.23063.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.23061.3 + 7.0.3-servicing.23061.3 + 7.0.3 + 7.0.3 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.2 - 7.0.2 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 7d32485f19a2602996c9a9361bf4dcfa40825764 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 00:44:53 +0000 Subject: [PATCH 097/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23067.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..82462001d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,12 +41,16 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64dda4212..f01481d14 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 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 38c1c4bb218fdb9e1628db372d72babee098165e https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bdb29b3dc96302426de3433e38b150c90f1c8af6 + 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c462aca4006d7a7b19385497e7c24d1baa9e8c1a + 59c5cf48269b707755d338d7575a060726d1a86e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c462aca4006d7a7b19385497e7c24d1baa9e8c1a + 59c5cf48269b707755d338d7575a060726d1a86e diff --git a/eng/Versions.props b/eng/Versions.props index 73d03616d..0f90ce321 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 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.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 0.2.0 - 6.0.406-servicing.23061.43 - 6.0.406-servicing.23061.43 + 6.0.406-servicing.23067.17 + 6.0.406-servicing.23067.17 $(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.23063.9 + 6.0.14-servicing.23063.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.23061.5 + 6.0.14-servicing.23061.5 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.405 + 6.0.406 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From c25343453c04fabf037bc8c6999d5132025c176c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 07:04:11 +0000 Subject: [PATCH 098/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f9b465db..01adda067 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c493a89c2..86eea3e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5de40e185ef97f25c7288ac3832912427cb0aa6 + 6b923a3482df75150b7b17a1662fe4032a210d8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5de40e185ef97f25c7288ac3832912427cb0aa6 + 6b923a3482df75150b7b17a1662fe4032a210d8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5de40e185ef97f25c7288ac3832912427cb0aa6 + 6b923a3482df75150b7b17a1662fe4032a210d8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5de40e185ef97f25c7288ac3832912427cb0aa6 + 6b923a3482df75150b7b17a1662fe4032a210d8b @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - da2ab184d2f9e12f85284039a4f442ca0b499de0 + 25b17d713aefb7754f5edbf786197d1fe737b933 diff --git a/eng/Versions.props b/eng/Versions.props index a1968dcd9..574992527 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23067.14 - 7.0.103-servicing.23067.14 + 7.0.103-servicing.23067.32 + 7.0.103-servicing.23067.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 964229ad774c5c4dcdfb12eea761abc5bde2a91e Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 18 Jan 2023 10:13:34 -0600 Subject: [PATCH 099/864] This issue appears to have been resolved, patch is conflicting. --- ...solvePackageFileConflicts-workaround.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch 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 4a2c17a9d2511e569113eb4efe40d4e922996263 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 21:47:29 +0000 Subject: [PATCH 100/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23068.11 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.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,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.14 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 17 ++++++----- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba290bb3a..36fb57f1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b4980ff0..c076f9ad7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8d092792ad6a1234cd59907cd39786723be8673 + 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8d092792ad6a1234cd59907cd39786723be8673 + 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8d092792ad6a1234cd59907cd39786723be8673 + 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e7199aefecf8653ee05202029c629ae00ce1ddd + b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e7199aefecf8653ee05202029c629ae00ce1ddd + b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 @@ -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 f23bb7239..6a9201d99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 + 6.0.14-servicing.23067.14 + 6.0.14-servicing.23067.14 + 6.0.14-servicing.23067.14 + 6.0.14-servicing.23067.14 0.2.0 - 6.0.114-servicing.23063.31 - 6.0.114-servicing.23063.31 + 6.0.114-servicing.23068.11 + 6.0.114-servicing.23068.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23056.8 - 6.0.14-servicing.23056.8 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23060.8 - 6.0.14-servicing.23060.8 + 6.0.14-servicing.23061.5 + 6.0.14-servicing.23061.5 6.0.14 6.0.14 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From cc6c2c91431d0fe194a4b6a83174050f97a43ef7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 22:00:45 +0000 Subject: [PATCH 101/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23068.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 f01481d14..05f5e2e92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59c5cf48269b707755d338d7575a060726d1a86e + fa83d8f2790b2fc329628f47c61d60032391a40f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59c5cf48269b707755d338d7575a060726d1a86e + fa83d8f2790b2fc329628f47c61d60032391a40f diff --git a/eng/Versions.props b/eng/Versions.props index 0f90ce321..2aa28c7d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23067.17 - 6.0.406-servicing.23067.17 + 6.0.406-servicing.23068.15 + 6.0.406-servicing.23068.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 567e0c97be08bfa22b2115ce7b0a7b3fae60bf4d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 03:30:38 +0000 Subject: [PATCH 102/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23067.13 -> To Version 6.0.309-servicing.23068.22 --- 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 7b0d78ab1..ffafe85f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 906e24ca802a74b64e2a4e3951ef2e8736a12f7c + b6c912387a5240eed88afe3327b00c2dec5fdadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 906e24ca802a74b64e2a4e3951ef2e8736a12f7c + b6c912387a5240eed88afe3327b00c2dec5fdadd diff --git a/eng/Versions.props b/eng/Versions.props index cbac3b8db..4bed1e33d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23067.13 - 6.0.309-servicing.23067.13 + 6.0.309-servicing.23068.22 + 6.0.309-servicing.23068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ef4ac737a2fd1fd61027c7316f1c6be38b4454e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 18:50:25 +0000 Subject: [PATCH 103/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 01adda067..4ad675b49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86eea3e08..d9d35a50e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b923a3482df75150b7b17a1662fe4032a210d8b + ebbad9596e8ffe3e9260f47cd9c4191e48e80429 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b923a3482df75150b7b17a1662fe4032a210d8b + ebbad9596e8ffe3e9260f47cd9c4191e48e80429 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b923a3482df75150b7b17a1662fe4032a210d8b + ebbad9596e8ffe3e9260f47cd9c4191e48e80429 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b923a3482df75150b7b17a1662fe4032a210d8b + ebbad9596e8ffe3e9260f47cd9c4191e48e80429 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 25b17d713aefb7754f5edbf786197d1fe737b933 + 0760f14ebbc4a4f2a4fa282994d9e43b49f9795c diff --git a/eng/Versions.props b/eng/Versions.props index 574992527..2f82e20e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23067.32 - 7.0.103-servicing.23067.32 + 7.0.103-servicing.23069.13 + 7.0.103-servicing.23069.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cdfc1dac10a7a3802eceb689e5d2de18a2c4f234 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:20:04 +0000 Subject: [PATCH 104/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23067.13 -> To Version 6.0.309-servicing.23069.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.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 From Version 6.0.14-servicing.23063.9 -> To Version 6.0.14-servicing.23067.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2268fdc45..db6858fe9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffafe85f3..e866809c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6c912387a5240eed88afe3327b00c2dec5fdadd + b0570a30cfbc5242f8eb3d628603bb9eaa00187c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6c912387a5240eed88afe3327b00c2dec5fdadd + b0570a30cfbc5242f8eb3d628603bb9eaa00187c diff --git a/eng/Versions.props b/eng/Versions.props index 4bed1e33d..a55556cb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 0.2.0 - 6.0.309-servicing.23068.22 - 6.0.309-servicing.23068.22 + 6.0.309-servicing.23069.19 + 6.0.309-servicing.23069.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23063.9 - 6.0.14-servicing.23063.9 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 From 71832da9c7f5c30973707c19e3db9f1b9ac690ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:23:03 +0000 Subject: [PATCH 105/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.406-servicing.23061.43 -> To Version 6.0.406-servicing.23069.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82462001d..f0974c636 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,13 +41,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05f5e2e92..c34aff905 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a + 371ce7e98e618aca8770fbd52dfe1d027908e357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a + 371ce7e98e618aca8770fbd52dfe1d027908e357 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3bbeb3f3ee40c9b01268e1703e4a49807fa3aa4a + 371ce7e98e618aca8770fbd52dfe1d027908e357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa83d8f2790b2fc329628f47c61d60032391a40f + 3f72a022e604f6c692c9764a296efe50e52316f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa83d8f2790b2fc329628f47c61d60032391a40f + 3f72a022e604f6c692c9764a296efe50e52316f1 diff --git a/eng/Versions.props b/eng/Versions.props index 2aa28c7d3..0dcc8d8e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 0.2.0 - 6.0.406-servicing.23068.15 - 6.0.406-servicing.23068.15 + 6.0.406-servicing.23069.18 + 6.0.406-servicing.23069.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23063.9 - 6.0.14-servicing.23063.9 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 From 364f2acbc756a5d5105b78877441943c92701d70 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:31:25 +0000 Subject: [PATCH 106/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ad675b49..55b066340 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6a7e7945..09da0ae2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8731b132bcaa909bdbc60b71ce461135a2e23f20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de2e2285d8f4bb9140707297f86f67a35670a803 + 153136d3515bc5e25090bf27530c64fa6ea1c236 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de2e2285d8f4bb9140707297f86f67a35670a803 + 153136d3515bc5e25090bf27530c64fa6ea1c236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de2e2285d8f4bb9140707297f86f67a35670a803 + 153136d3515bc5e25090bf27530c64fa6ea1c236 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de2e2285d8f4bb9140707297f86f67a35670a803 + 153136d3515bc5e25090bf27530c64fa6ea1c236 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de2e2285d8f4bb9140707297f86f67a35670a803 + 153136d3515bc5e25090bf27530c64fa6ea1c236 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de2e2285d8f4bb9140707297f86f67a35670a803 + 153136d3515bc5e25090bf27530c64fa6ea1c236 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebbad9596e8ffe3e9260f47cd9c4191e48e80429 + 64e2da2d367bf00a3706f1eecb0e3f6f898e306f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebbad9596e8ffe3e9260f47cd9c4191e48e80429 + 64e2da2d367bf00a3706f1eecb0e3f6f898e306f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebbad9596e8ffe3e9260f47cd9c4191e48e80429 + 64e2da2d367bf00a3706f1eecb0e3f6f898e306f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebbad9596e8ffe3e9260f47cd9c4191e48e80429 + 64e2da2d367bf00a3706f1eecb0e3f6f898e306f diff --git a/eng/Versions.props b/eng/Versions.props index 0ab50cb4e..66e6cd26d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23069.13 - 7.0.103-servicing.23069.13 + 7.0.103-servicing.23069.17 + 7.0.103-servicing.23069.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.3-servicing.23063.10 - 7.0.3-servicing.23063.10 + 7.0.3-servicing.23067.8 + 7.0.3-servicing.23067.8 7.0.3 7.0.3 7.0.3 From 1cdf9e8b8936090409553e32be918f8b40fde8ea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Jan 2023 13:24:36 +0000 Subject: [PATCH 107/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230120.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.102 -> To Version 7.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++--- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 55b066340..3965195a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09da0ae2f..1818ea406 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64e2da2d367bf00a3706f1eecb0e3f6f898e306f + 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64e2da2d367bf00a3706f1eecb0e3f6f898e306f + 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64e2da2d367bf00a3706f1eecb0e3f6f898e306f + 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64e2da2d367bf00a3706f1eecb0e3f6f898e306f + 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 @@ -151,7 +151,7 @@ https://github.com/dotnet/msbuild - 9a89d02ff5de19d84190ebed4a6017df4dc19dc4 + fedecea9d0d923d3520309dcf69e1dd4a485ef75 diff --git a/eng/Versions.props b/eng/Versions.props index 66e6cd26d..09caf3838 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23069.17 - 7.0.103-servicing.23069.17 + 7.0.103-servicing.23070.4 + 7.0.103-servicing.23070.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9dfa832bb92306f6a3676874e5c48db7aab25f37 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Jan 2023 18:05:42 +0000 Subject: [PATCH 108/864] 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 022069599a1b93ad203de0621e6af98c524b50d0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 20 Jan 2023 10:15:02 -0800 Subject: [PATCH 109/864] Disable too more tests on linux portable for the known nuget issue. --- test/SdkTests/TestsToSkipPortableLinux.xml | 8 ++++++++ 1 file changed, 8 insertions(+) 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 b743cc9964e25ee5a3c419b529d5b4015dbf2aa0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Jan 2023 18:24:00 +0000 Subject: [PATCH 110/864] 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 788cbcfdba8a243bab2641623855034e4c3f2c9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Jan 2023 19:55:42 +0000 Subject: [PATCH 111/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230120.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23070.9 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.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,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.14 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- 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 36fb57f1e..3cdc8dc2e 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 c076f9ad7..afb4cb6c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce + 6b445bbe8207bbdd76a49e055bb8fe4db03327db - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce + 6b445bbe8207bbdd76a49e055bb8fe4db03327db https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce + 6b445bbe8207bbdd76a49e055bb8fe4db03327db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 + 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 + 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e diff --git a/eng/Versions.props b/eng/Versions.props index 6a9201d99..c39af1667 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23067.14 - 6.0.14-servicing.23067.14 - 6.0.14-servicing.23067.14 - 6.0.14-servicing.23067.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 0.2.0 - 6.0.114-servicing.23068.11 - 6.0.114-servicing.23068.11 + 6.0.114-servicing.23070.9 + 6.0.114-servicing.23070.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de87c6c89c81daabb218f97f9f715b696a69c394 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Jan 2023 15:55:36 -0600 Subject: [PATCH 112/864] 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 1c87de035748de4cb1c40edde6b8184daef7aefd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 22 Jan 2023 17:41:33 +0000 Subject: [PATCH 113/864] Merged PR 29033: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.406-rtm.23069.2 to 6.0.406-rtm.23070.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230120.36 - **Date Produced**: January 21, 2023 6:32:52 AM UTC - **Commit**: 8142ddd5a92589859c058681f3bf58372c1f87a4 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23069.18 to 6.0.406-servicing.23070.36][3] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23069.18 to 6.0.406-servicing.23070.36][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23067.7 to 6... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index f0974c636..cd62f1e28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,13 +41,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a01c1776..56fecfbf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f72a022e604f6c692c9764a296efe50e52316f1 + 8142ddd5a92589859c058681f3bf58372c1f87a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f72a022e604f6c692c9764a296efe50e52316f1 + 8142ddd5a92589859c058681f3bf58372c1f87a4 diff --git a/eng/Versions.props b/eng/Versions.props index 832f0aa7b..ef79c6b78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.406-servicing.23069.18 - 6.0.406-servicing.23069.18 + 6.0.406-servicing.23070.36 + 6.0.406-servicing.23070.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14 From 3a92ed451a0f6fb092c9a8d50c11a681704db76e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:20 +0000 Subject: [PATCH 114/864] Merged PR 29046: [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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.114-servicing.23069.5 to 6.0.114-servicing.23070.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22601.5 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3cdc8dc2e..0c9cb0a39 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,13 +15,13 @@ - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 073db2f3b..8f8fdfe5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b445bbe8207bbdd76a49e055bb8fe4db03327db + b62a43a54b753d428d7243f4ec1058a991e369bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b445bbe8207bbdd76a49e055bb8fe4db03327db + b62a43a54b753d428d7243f4ec1058a991e369bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b445bbe8207bbdd76a49e055bb8fe4db03327db + b62a43a54b753d428d7243f4ec1058a991e369bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e + 1abec7424beea61071d5469dafd56547a1c2c864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e + 1abec7424beea61071d5469dafd56547a1c2c864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + d40327ad15e6653d027e003749a3bf16fd603101 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 41bfa9043..8a43607bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23070.2 @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.114-servicing.23070.9 - 6.0.114-servicing.23070.9 + 6.0.114-servicing.23073.2 + 6.0.114-servicing.23073.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23061.5 - 6.0.14-servicing.23061.5 + 6.0.14-servicing.23072.1 + 6.0.14-servicing.23072.1 6.0.14 6.0.14 From 8e99d20c5eeb2e076f4d33a3160615f83199bde0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:32 +0000 Subject: [PATCH 115/864] Merged PR 29049: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23069.3 to 6.0.309-servicing.23070.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microso... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index db6858fe9..d0d3e0257 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 e866809c0..b9fe53569 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0570a30cfbc5242f8eb3d628603bb9eaa00187c + a444ef95fc29cb478922eac7d89adb215efb563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0570a30cfbc5242f8eb3d628603bb9eaa00187c + a444ef95fc29cb478922eac7d89adb215efb563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + d40327ad15e6653d027e003749a3bf16fd603101 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a55556cb9..e0550e544 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23070.2 @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.309-servicing.23069.19 - 6.0.309-servicing.23069.19 + 6.0.309-servicing.23073.3 + 6.0.309-servicing.23073.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23061.5 - 6.0.14-servicing.23061.5 + 6.0.14-servicing.23072.1 + 6.0.14-servicing.23072.1 6.0.14 6.0.14 From faa22bb359cb0fe8e3843b16d6f48efd76322c13 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:38 +0000 Subject: [PATCH 116/864] Merged PR 29076: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22601.5 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230123.4 - **Date Produced**: January 23, 2023 5:21:23 PM UTC - **Commit**: 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23070.36 to 6.0.406-servicing.23073.4][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23070.36 to 6.0.406-servicing.23073.4][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22601.5 to 6.0.14-servicing.23070.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8142ddd&targetVersion=GC0efeb6c&_a=files [2]: https://dev.az... --- 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 cd62f1e28..9b9d1a70f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56fecfbf9..656239c93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8142ddd5a92589859c058681f3bf58372c1f87a4 + 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8142ddd5a92589859c058681f3bf58372c1f87a4 + 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + d40327ad15e6653d027e003749a3bf16fd603101 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ef79c6b78..144236889 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23070.2 @@ -56,8 +56,8 @@ - 6.0.406-servicing.23070.36 - 6.0.406-servicing.23070.36 + 6.0.406-servicing.23073.4 + 6.0.406-servicing.23073.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23061.5 - 6.0.14-servicing.23061.5 + 6.0.14-servicing.23072.1 + 6.0.14-servicing.23072.1 6.0.14 6.0.14 From d46847ef3a1f144318eaf73726a8c11704ac7a1e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 20:56:14 +0000 Subject: [PATCH 117/864] Merged PR 29040: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23061.3 to 7.0.3-servicing.23072.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23061.3 to 7.0.3-servicing.23072.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.3-servicing.23067.8 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.2-servicing.22606.2 to 7.0.3-servicing.23061.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23067.8 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23067.8 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230122.7 - **Date Produced**: January 23, 2023 6:36:05 AM UTC - **Commit**: 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23070.4 to 7.0.103-servicing.23072.7][5] - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23070.4 to 7.0.103-servicing.23072.7][5] - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23070.4 to 7.0.103-servicing.23072.7][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.3 to 7... --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3965195a6..a6367383b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1818ea406..f15c21df4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8731b132bcaa909bdbc60b71ce461135a2e23f20 + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8731b132bcaa909bdbc60b71ce461135a2e23f20 + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8731b132bcaa909bdbc60b71ce461135a2e23f20 + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8731b132bcaa909bdbc60b71ce461135a2e23f20 + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 153136d3515bc5e25090bf27530c64fa6ea1c236 + 0a2bda10e81d901396c3cff95533529e3a93ad47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 153136d3515bc5e25090bf27530c64fa6ea1c236 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 153136d3515bc5e25090bf27530c64fa6ea1c236 + 0a2bda10e81d901396c3cff95533529e3a93ad47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 153136d3515bc5e25090bf27530c64fa6ea1c236 + 0a2bda10e81d901396c3cff95533529e3a93ad47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 153136d3515bc5e25090bf27530c64fa6ea1c236 + 0a2bda10e81d901396c3cff95533529e3a93ad47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 153136d3515bc5e25090bf27530c64fa6ea1c236 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 + 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 + 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 + 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409 + 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 8b06c27c9b81f33e69f8d5155fe69693f661fa3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df04c57b2e2bb986f0afc2384cbebb3c950447b5 + 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 09caf3838..90aeb5699 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ - 7.0.2-servicing.22606.2 + 7.0.3-servicing.23061.11 @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23070.4 - 7.0.103-servicing.23070.4 + 7.0.103-servicing.23072.7 + 7.0.103-servicing.23072.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.3-servicing.23067.8 - 7.0.3-servicing.23067.8 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 7.0.3 7.0.3 7.0.3 @@ -86,8 +86,8 @@ - 7.0.3-servicing.23061.3 - 7.0.3-servicing.23061.3 + 7.0.3-servicing.23072.2 + 7.0.3-servicing.23072.2 7.0.3 7.0.3 From ee182e1fe73882d75f3d2ebbe0778b30353c64ff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 20:56:35 +0000 Subject: [PATCH 118/864] Merged PR 28926: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23072.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23072.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23062.18 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22518.7 to 7.0.2-servicing.22606.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22518.2 to 7.0.3-servicing.23061.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.5.0-beta.23059.11 to 12.5.0-beta.23069.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.1-beta.23059.11 to 7.0.200-beta.23069.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.22579.2 to 7.0.100-1... --- .vsts-ci.yml | 9 +- NuGet.config | 9 ++ eng/Version.Details.xml | 128 +++++++++--------- eng/Versions.props | 48 +++---- ...solvePackageFileConflicts-workaround.patch | 23 ---- 5 files changed, 102 insertions(+), 115 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..266784afc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..0148533a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,19 @@ + + + + + @@ -36,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76a6cf0f0..8bbe10d4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + e2a3f564fa6d9db4bc83893337c87c225ba6a5de https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - - https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 91d3f08648bb0b76b5354ff737e1a3ade221cb4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + 8b06c27c9b81f33e69f8d5155fe69693f661fa3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899 - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + e391694876e891d2cdc4089e62fe7b1138d8294e - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + e391694876e891d2cdc4089e62fe7b1138d8294e @@ -138,20 +138,20 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153..543ff5ef3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.2-servicing.22606.8 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23061.11 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 + 7.0.3-servicing.23062.18 0.2.0 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.200 + 7.0.200-rtm.23073.5 + 7.0.200-rtm.23073.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.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.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23072.2 + 7.0.3-servicing.23072.2 + 7.0.3 + 7.0.3 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 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 e36f7f3feaa561782a66165b8db55f4c0bbdf963 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 23 Jan 2023 18:26:27 -0800 Subject: [PATCH 119/864] [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 818470c898736ddee0a673826464a42189df4cd8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 15:20:41 +0000 Subject: [PATCH 120/864] Merged PR 29088: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.2-servicing.22606.8 to 7.0.3-servicing.23072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23061.11 to 7.0.3-servicing.23073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230123.11 - **Date Produced**: January 23, 2023 10:23:34 PM UTC - **Commit**: 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23072.7 to 7.0.103-servicing.23073.11][1] - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23072.7 to 7.0.103-servicing.23073.11][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23072.7 to 7.0.103-servicing.23073.11][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.2-servicing.22606.8 to 7.0.3-servicing.23072.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.3-servicing.23061.11 to 7.0.3-servicing.... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6367383b..747cc482b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f15c21df4..37daa1897 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d + 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d + 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d + 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7ed0ba8a8983cef1e8a4c2874364e102da3c8d + 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899 + 0a09c7d17212981cb4fd5907fa6a6214966a366d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4b87d6f50..b72fae911 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.3-servicing.23061.11 + 7.0.3-servicing.23073.1 @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23072.7 - 7.0.103-servicing.23072.7 + 7.0.103-servicing.23073.11 + 7.0.103-servicing.23073.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.3-servicing.23072.2 - 7.0.3-servicing.23072.2 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 7.0.3 7.0.3 From 92790e6ec9811a1e6269f81d4dd2fcfbc1740e2d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 15:21:09 +0000 Subject: [PATCH 121/864] Merged PR 29090: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.2-servicing.22606.8 to 7.0.3-servicing.23072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23061.11 to 7.0.3-servicing.23073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230123.13 - **Date Produced**: January 23, 2023 11:21:51 PM UTC - **Commit**: 0498415bdd41d96152e70726f407c39c02feb825 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23073.5 to 7.0.200-rtm.23073.13][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23073.5 to 7.0.200-rtm.23073.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23073.5 to 7.0.200-rtm.23073.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.3-servicing.23072.2 to 7.0.3-servicing.23073.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.2-servicing.22606.8 to 7.0.3-servicing.23072.1][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.3-servicing.23061.11 to 7.0.3-servicing.23073.1][4] [1]: https://dev.azur... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0148533a5..b8bee2aa4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bbe10d4e..92bb4e403 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015 + 0e6192540357f08063fb1127f1a791fb6a3e194c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91d3f08648bb0b76b5354ff737e1a3ade221cb4a + 0498415bdd41d96152e70726f407c39c02feb825 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899 + 0a09c7d17212981cb4fd5907fa6a6214966a366d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 543ff5ef3..678c23c11 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.3-servicing.23061.11 + 7.0.3-servicing.23073.1 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23073.5 - 7.0.200-rtm.23073.5 + 7.0.200-rtm.23073.13 + 7.0.200-rtm.23073.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.3-servicing.23072.2 - 7.0.3-servicing.23072.2 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 7.0.3 7.0.3 From 559aa795997d2925dc8a7a84fa71378609a26053 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:55:48 +0000 Subject: [PATCH 122/864] Merged PR 29136: [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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.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**: 20230124.6 - **Date Produced**: January 24, 2023 3:52:55 PM UTC - **Commit**: 5005a736e2825036e50a04be9930769c03f93572 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23073.2 to 6.0.114-servicing.23074.6][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23073.2 to 6.0.114-servicing.23074.6][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1abec74&targetVersion=GC5005a73&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0c9cb0a39..90404cfbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f8fdfe5f..5ed463c2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b62a43a54b753d428d7243f4ec1058a991e369bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1abec7424beea61071d5469dafd56547a1c2c864 + 5005a736e2825036e50a04be9930769c03f93572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1abec7424beea61071d5469dafd56547a1c2c864 + 5005a736e2825036e50a04be9930769c03f93572 diff --git a/eng/Versions.props b/eng/Versions.props index 8a43607bb..b0b926e4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23073.2 - 6.0.114-servicing.23073.2 + 6.0.114-servicing.23074.6 + 6.0.114-servicing.23074.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.14 From 4520d0d9dd48edbe11f686439e0d773100250df4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:56:04 +0000 Subject: [PATCH 123/864] Merged PR 29134: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.7 - **Date Produced**: January 24, 2023 3:51:36 PM UTC - **Commit**: 757ae6a7afd4265ba90def3c570b46279d7f9adf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23073.3 to 6.0.309-servicing.23074.7][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23073.3 to 6.0.309-servicing.23074.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa444ef9&targetVersion=GC757ae6a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0d3e0257..e7631a4a6 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 b9fe53569..76f13f638 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a444ef95fc29cb478922eac7d89adb215efb563b + 757ae6a7afd4265ba90def3c570b46279d7f9adf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a444ef95fc29cb478922eac7d89adb215efb563b + 757ae6a7afd4265ba90def3c570b46279d7f9adf diff --git a/eng/Versions.props b/eng/Versions.props index e0550e544..9a47ed58b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23073.3 - 6.0.309-servicing.23073.3 + 6.0.309-servicing.23074.7 + 6.0.309-servicing.23074.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.14 From c165970f9f115127ca2a20bf700a8505c838ea34 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:56:07 +0000 Subject: [PATCH 124/864] Merged PR 29135: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.8 - **Date Produced**: January 24, 2023 3:53:30 PM UTC - **Commit**: 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23073.4 to 6.0.406-servicing.23074.8][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23073.4 to 6.0.406-servicing.23074.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0efeb6c&targetVersion=GC3caaeaa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9b9d1a70f..19b530eb1 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 656239c93..43eb755e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 + 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3 + 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 diff --git a/eng/Versions.props b/eng/Versions.props index 144236889..adc2607ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23073.4 - 6.0.406-servicing.23073.4 + 6.0.406-servicing.23074.8 + 6.0.406-servicing.23074.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.14 From 5d7b9b0cf16dbccdb61543bcab334d194dfbeb7d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:20:24 +0000 Subject: [PATCH 125/864] Merged PR 29155: [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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.114-servicing.23070.9 to 6.0.114-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.114 to 6.0.114 (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**: 20230124.15 - **Date Produced**: January 24, 2023 5:53:22 PM UTC - **Commit**: 70e268dcc55cdc08f9b2f46db120e1780b062f26 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23074.6 to 6.0.114-servicing.23074.15][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23074.6 to 6.0.114-servicing.23074.15][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.114 to 6.0.114][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.114-servicing.23070.9 to 6.0.114-servicing.23074.4][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 90404cfbf..ecce92288 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 5ed463c2e..cefe0184a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b62a43a54b753d428d7243f4ec1058a991e369bc + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b62a43a54b753d428d7243f4ec1058a991e369bc + 629fc1a8b3d53b551ea512c4f0294062dcd30afe https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b62a43a54b753d428d7243f4ec1058a991e369bc + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5005a736e2825036e50a04be9930769c03f93572 + 70e268dcc55cdc08f9b2f46db120e1780b062f26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5005a736e2825036e50a04be9930769c03f93572 + 70e268dcc55cdc08f9b2f46db120e1780b062f26 diff --git a/eng/Versions.props b/eng/Versions.props index b0b926e4f..db44d6a3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 + 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.114-servicing.23074.6 - 6.0.114-servicing.23074.6 + 6.0.114-servicing.23074.15 + 6.0.114-servicing.23074.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5414ad1e943690d5e1e093a3931424d391210952 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:20:39 +0000 Subject: [PATCH 126/864] Merged PR 29157: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.17 - **Date Produced**: January 24, 2023 5:53:01 PM UTC - **Commit**: 31e2469f0512604e376cf0034333c5a6a87a21b5 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23074.8 to 6.0.406-servicing.23074.17][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23074.8 to 6.0.406-servicing.23074.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3caaeaa&targetVersion=GC31e2469&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa1bfef7&targetVersion=GC54e8b61&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 19b530eb1..143be8960 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 43eb755e2..cfe813f06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 + 31e2469f0512604e376cf0034333c5a6a87a21b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 + 31e2469f0512604e376cf0034333c5a6a87a21b5 diff --git a/eng/Versions.props b/eng/Versions.props index adc2607ef..e49a941af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 + 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.406-servicing.23074.8 - 6.0.406-servicing.23074.8 + 6.0.406-servicing.23074.17 + 6.0.406-servicing.23074.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c44327770741be8533549f59a8d89d4940c2076a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:21:00 +0000 Subject: [PATCH 127/864] Merged PR 29158: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.16 - **Date Produced**: January 24, 2023 5:53:11 PM UTC - **Commit**: 19bf1b2c73b69a38ac637787c7833244156d2da0 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.7 to 6.0.309-servicing.23074.16][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.7 to 6.0.309-servicing.23074.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC757ae6a&targetVersion=GC19bf1b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa1bfef7&targetVersion=GC54e8b61&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7631a4a6..5a99ba751 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 76f13f638..c49b95b6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 757ae6a7afd4265ba90def3c570b46279d7f9adf + 19bf1b2c73b69a38ac637787c7833244156d2da0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 757ae6a7afd4265ba90def3c570b46279d7f9adf + 19bf1b2c73b69a38ac637787c7833244156d2da0 diff --git a/eng/Versions.props b/eng/Versions.props index 9a47ed58b..dda910d69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 + 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.309-servicing.23074.7 - 6.0.309-servicing.23074.7 + 6.0.309-servicing.23074.16 + 6.0.309-servicing.23074.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e1e80e1724b17e220af97d3c2cc2285e54fdf75f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:21:27 +0000 Subject: [PATCH 128/864] Merged PR 29138: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230124.9 - **Date Produced**: January 24, 2023 4:06:58 PM UTC - **Commit**: 4a43f33e107edbe3ba9c54faaad622fce91888e6 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23073.11 to 7.0.103-servicing.23074.9][1] - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23073.11 to 7.0.103-servicing.23074.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23073.11 to 7.0.103-servicing.23074.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7935de8&targetVersion=GC4a43f33&_a=files [2]: https://dev.azure.com/... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 747cc482b..679fea181 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37daa1897..99d1a6062 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 + 4a43f33e107edbe3ba9c54faaad622fce91888e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 + 4a43f33e107edbe3ba9c54faaad622fce91888e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 + 4a43f33e107edbe3ba9c54faaad622fce91888e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7935de868e9e25ecd4bc5c11c24ee8b4d0e45e31 + 4a43f33e107edbe3ba9c54faaad622fce91888e6 diff --git a/eng/Versions.props b/eng/Versions.props index b72fae911..a5c7365f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 0.2.0 @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23073.11 - 7.0.103-servicing.23073.11 + 7.0.103-servicing.23074.9 + 7.0.103-servicing.23074.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d827aeafc601d808c8943029e292efd8f0622ed5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:24:47 +0000 Subject: [PATCH 129/864] Merged PR 29137: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230124.10 - **Date Produced**: January 24, 2023 4:07:45 PM UTC - **Commit**: 80d46a254ef8523b54e2ed6d18a912744b11165d - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23073.13 to 7.0.200-rtm.23074.10][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23073.13 to 7.0.200-rtm.23074.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23073.13 to 7.0.200-rtm.23074.10][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23062.18 to 7.0.3-servicing.23073.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0498415&targetVersion=GC80d46a2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspn... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8bee2aa4..2df832ae4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92bb4e403..38342a5a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e2a3f564fa6d9db4bc83893337c87c225ba6a5de + 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0498415bdd41d96152e70726f407c39c02feb825 + 80d46a254ef8523b54e2ed6d18a912744b11165d diff --git a/eng/Versions.props b/eng/Versions.props index 678c23c11..cbc725fd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 - 7.0.3-servicing.23062.18 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 + 7.0.3-servicing.23073.14 0.2.0 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23073.13 - 7.0.200-rtm.23073.13 + 7.0.200-rtm.23074.10 + 7.0.200-rtm.23074.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f3a869b15952f74a2ff130e3e88ceb5aa86dc774 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 19:38:35 +0000 Subject: [PATCH 130/864] Merged PR 29174: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.406-rtm.23070.11 to 6.0.406-rtm.23074.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.20 - **Date Produced**: January 24, 2023 6:56:06 PM UTC - **Commit**: cbeee7da10420597b6994c08f6c38c0610643027 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23074.17 to 6.0.406-servicing.23074.20][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23074.17 to 6.0.406-servicing.23074.20][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.406 to 6.0.406][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.406-rtm.23070.11 to 6.0.406-rtm.23074.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.406 to 6.0.406][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC31e2469&targetVersion=GCcbeee7d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC3808dc6&targetVersion=GC647bf84&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 143be8960..49dc24bee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe813f06..5169f1954 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3808dc647c961aec9812a18f6454fd33f7cb4a8c + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3808dc647c961aec9812a18f6454fd33f7cb4a8c + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3808dc647c961aec9812a18f6454fd33f7cb4a8c + 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 31e2469f0512604e376cf0034333c5a6a87a21b5 + cbeee7da10420597b6994c08f6c38c0610643027 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 31e2469f0512604e376cf0034333c5a6a87a21b5 + cbeee7da10420597b6994c08f6c38c0610643027 diff --git a/eng/Versions.props b/eng/Versions.props index e49a941af..6332e74ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.406-servicing.23074.17 - 6.0.406-servicing.23074.17 + 6.0.406-servicing.23074.20 + 6.0.406-servicing.23074.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 346c0065dd9540261ec07e938b808833446d2a9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:11 +0000 Subject: [PATCH 131/864] Merged PR 29178: [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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (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**: 20230124.26 - **Date Produced**: January 24, 2023 7:38:33 PM UTC - **Commit**: 9f111ce1a19301c2258920ba362206837c5ef8b0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23074.15 to 6.0.114-servicing.23074.26][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23074.15 to 6.0.114-servicing.23074.26][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC70e268d&targetVersion=GC9f111ce&_a=files [2]: https://dev... --- 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 ecce92288..287683d61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cefe0184a..68c4766c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70e268dcc55cdc08f9b2f46db120e1780b062f26 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70e268dcc55cdc08f9b2f46db120e1780b062f26 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index db44d6a3d..45c80ad97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 @@ -56,8 +56,8 @@ - 6.0.114-servicing.23074.15 - 6.0.114-servicing.23074.15 + 6.0.114-servicing.23074.26 + 6.0.114-servicing.23074.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23072.1 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 6.0.14 6.0.14 From 67ef69fc068a481a4d29c35106650979015d4033 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:15 +0000 Subject: [PATCH 132/864] Merged PR 29180: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.27 - **Date Produced**: January 24, 2023 7:40:01 PM UTC - **Commit**: b814c7cbbf53a1fa23c050ab74d116693dbd58bc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.16 to 6.0.309-servicing.23074.27][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.16 to 6.0.309-servicing.23074.27][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19bf1b2&targetVersion=GCb814c7c&_a=files [2]: https://dev... --- 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 5a99ba751..e10226cfd 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 c49b95b6b..8f4247d74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19bf1b2c73b69a38ac637787c7833244156d2da0 + b814c7cbbf53a1fa23c050ab74d116693dbd58bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19bf1b2c73b69a38ac637787c7833244156d2da0 + b814c7cbbf53a1fa23c050ab74d116693dbd58bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dda910d69..7189aa8df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 @@ -56,8 +56,8 @@ - 6.0.309-servicing.23074.16 - 6.0.309-servicing.23074.16 + 6.0.309-servicing.23074.27 + 6.0.309-servicing.23074.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23072.1 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 6.0.14 6.0.14 From 2988897946e3c38c4c25ac28979feadc1a521a4d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:23 +0000 Subject: [PATCH 133/864] Merged PR 29186: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230124.29 - **Date Produced**: January 24, 2023 7:53:15 PM UTC - **Commit**: 04133de59be3070803d025a9dd52c07ef0087551 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23074.20 to 6.0.406-servicing.23074.29][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23074.20 to 6.0.406-servicing.23074.29][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCcbeee7d&targetVersion=GC04133de&_a=files [2]: https://dev... --- 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 49dc24bee..6c3e5b378 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5169f1954..2580ea82d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbeee7da10420597b6994c08f6c38c0610643027 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbeee7da10420597b6994c08f6c38c0610643027 + 04133de59be3070803d025a9dd52c07ef0087551 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6332e74ff..d53ee7394 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 @@ -56,8 +56,8 @@ - 6.0.406-servicing.23074.20 - 6.0.406-servicing.23074.20 + 6.0.406-servicing.23074.29 + 6.0.406-servicing.23074.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23072.1 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 6.0.14 6.0.14 From 3c53456654c1088980542f6d6987036bad2224a1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 21:03:18 +0000 Subject: [PATCH 134/864] Merged PR 29188: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230124.32 - **Date Produced**: January 24, 2023 8:21:58 PM UTC - **Commit**: 28bd69e0aea49037f5d6f600909657715780fe9c - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23074.9 to 7.0.103-servicing.23074.32][1] - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23074.9 to 7.0.103-servicing.23074.32][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23074.9 to 7.0.103-servicing.23074.32][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4a43f33&targetVersion=GC28bd69e&_a=files [2]: https://dev.azure.com/dnceng/in... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 679fea181..8a8e65c16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99d1a6062..2ddda917e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a43f33e107edbe3ba9c54faaad622fce91888e6 + 28bd69e0aea49037f5d6f600909657715780fe9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a43f33e107edbe3ba9c54faaad622fce91888e6 + 28bd69e0aea49037f5d6f600909657715780fe9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a43f33e107edbe3ba9c54faaad622fce91888e6 + 28bd69e0aea49037f5d6f600909657715780fe9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a43f33e107edbe3ba9c54faaad622fce91888e6 + 28bd69e0aea49037f5d6f600909657715780fe9c diff --git a/eng/Versions.props b/eng/Versions.props index a5c7365f3..7af39bb54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 0.2.0 @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23074.9 - 7.0.103-servicing.23074.9 + 7.0.103-servicing.23074.32 + 7.0.103-servicing.23074.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 901526848f8702d4234831ab84597a3c7d604e82 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 21:03:29 +0000 Subject: [PATCH 135/864] Merged PR 29187: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230124.33 - **Date Produced**: January 24, 2023 8:21:47 PM UTC - **Commit**: 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23074.10 to 7.0.200-rtm.23074.33][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23074.10 to 7.0.200-rtm.23074.33][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23074.10 to 7.0.200-rtm.23074.33][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23073.14 to 7.0.3-servicing.23074.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC80d46a2&targetVersion=GC24e4ce5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/bra... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2df832ae4..3be001b79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38342a5a4..52276ae81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 019069b70dd9c0f9f7ed374f3653e4d5e8129b2a + 3102273b1819997a17c88dac78e89ac59052cdc2 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80d46a254ef8523b54e2ed6d18a912744b11165d + 24e4ce5d4b73b0959fca44a22e725efb91c407e1 diff --git a/eng/Versions.props b/eng/Versions.props index cbc725fd5..1cee2d328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 - 7.0.3-servicing.23073.14 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 + 7.0.3-servicing.23074.4 0.2.0 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23074.10 - 7.0.200-rtm.23074.10 + 7.0.200-rtm.23074.33 + 7.0.200-rtm.23074.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f629b020f8d8d0a4b6870be21e76ad9c68f18151 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 21:21:26 +0000 Subject: [PATCH 136/864] Merged PR 29189: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.34 - **Date Produced**: January 24, 2023 8:41:08 PM UTC - **Commit**: 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.309 to 6.0.309][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.309 to 6.0.309][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb814c7c&targetVersion=GC54b8f37&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe455bc6&targetVersion=GCffeddec&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index e10226cfd..d32bdf112 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f4247d74..e92ec822e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b814c7cbbf53a1fa23c050ab74d116693dbd58bc + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b814c7cbbf53a1fa23c050ab74d116693dbd58bc + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 diff --git a/eng/Versions.props b/eng/Versions.props index 7189aa8df..21fe8f582 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23074.27 - 6.0.309-servicing.23074.27 + 6.0.309-servicing.23074.34 + 6.0.309-servicing.23074.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6359034b090ce4c85e4f89ef95cec996f79ae2ab Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 25 Jan 2023 19:36:05 +0000 Subject: [PATCH 137/864] Merged PR 29212: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230125.10 - **Date Produced**: January 25, 2023 6:59:01 PM UTC - **Commit**: 72e0c344fc8beab0f0e558b58b212193f66b86fe - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23074.32 to 7.0.103-servicing.23075.10][1] - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23074.32 to 7.0.103-servicing.23075.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23074.32 to 7.0.103-servicing.23075.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC28bd69e&targetVersion=GC72e0c34&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a8e65c16..4eb5d7654 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,11 @@ + + @@ -19,10 +21,11 @@ - + + @@ -44,14 +47,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ddda917e..4c41aa2fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28bd69e0aea49037f5d6f600909657715780fe9c + 72e0c344fc8beab0f0e558b58b212193f66b86fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28bd69e0aea49037f5d6f600909657715780fe9c + 72e0c344fc8beab0f0e558b58b212193f66b86fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28bd69e0aea49037f5d6f600909657715780fe9c + 72e0c344fc8beab0f0e558b58b212193f66b86fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28bd69e0aea49037f5d6f600909657715780fe9c + 72e0c344fc8beab0f0e558b58b212193f66b86fe diff --git a/eng/Versions.props b/eng/Versions.props index 7af39bb54..21da345bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23074.32 - 7.0.103-servicing.23074.32 + 7.0.103-servicing.23075.10 + 7.0.103-servicing.23075.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e57516fdfa3e8fb11749d192ca013b99043c8059 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 25 Jan 2023 19:45:27 +0000 Subject: [PATCH 138/864] Merged PR 29213: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230125.12 - **Date Produced**: January 25, 2023 7:14:47 PM UTC - **Commit**: b06e943b6b17783dd21fe81cb2f914a7120f5349 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23074.33 to 7.0.200-rtm.23075.12][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23074.33 to 7.0.200-rtm.23075.12][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23074.33 to 7.0.200-rtm.23075.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC24e4ce5&targetVersion=GCb06e943&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3be001b79..b6c0c5cd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,18 +8,21 @@ + + - + + @@ -41,14 +44,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0c756b63..22bc43324 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24e4ce5d4b73b0959fca44a22e725efb91c407e1 + b06e943b6b17783dd21fe81cb2f914a7120f5349 diff --git a/eng/Versions.props b/eng/Versions.props index 33b4166e9..8edaa4367 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23074.33 - 7.0.200-rtm.23074.33 + 7.0.200-rtm.23075.12 + 7.0.200-rtm.23075.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 276c71d299f6f6dcc3abfd6b3f1fb90c667b4aaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 30 Jan 2023 21:51:06 +0000 Subject: [PATCH 139/864] Merged PR 29268: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230130.6 - **Date Produced**: January 30, 2023 9:03:42 PM UTC - **Commit**: ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.103 to 7.0.103][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.103-servicing.23075.10 to 7.0.103-servicing.23080.6][1] - **Microsoft.NET.Sdk**: [from 7.0.103-servicing.23075.10 to 7.0.103-servicing.23080.6][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.103-servicing.23075.10 to 7.0.103-servicing.23080.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC72e0c34&targetVersion=GCced1028&_a=files [2]: https://dev.azure.com/dnceng/internal/_git... --- NuGet.config | 13 +++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4eb5d7654..ad090420b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,11 @@ - - + + @@ -21,10 +21,11 @@ - + + @@ -47,16 +48,16 @@ - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c41aa2fa..9aa70ccdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 72e0c344fc8beab0f0e558b58b212193f66b86fe + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 72e0c344fc8beab0f0e558b58b212193f66b86fe + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 72e0c344fc8beab0f0e558b58b212193f66b86fe + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 72e0c344fc8beab0f0e558b58b212193f66b86fe + ced1028bbbf0ce31e736e0e9d137a1b690fbb50d diff --git a/eng/Versions.props b/eng/Versions.props index 21da345bd..f7874947f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 + 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 @@ -64,8 +64,8 @@ 7.0.103 - 7.0.103-servicing.23075.10 - 7.0.103-servicing.23075.10 + 7.0.103-servicing.23080.6 + 7.0.103-servicing.23080.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 534117727ba029772571b09ac6012956e605949b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 30 Jan 2023 21:51:09 +0000 Subject: [PATCH 140/864] Merged PR 29269: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230130.7 - **Date Produced**: January 30, 2023 9:04:37 PM UTC - **Commit**: fc6a47e3e33b91bd2690161465db7a6c4149d480 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.200 to 7.0.200][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.200-rtm.23075.12 to 7.0.200-rtm.23080.7][1] - **Microsoft.NET.Sdk**: [from 7.0.200-rtm.23075.12 to 7.0.200-rtm.23080.7][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.200-rtm.23075.12 to 7.0.200-rtm.23080.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.3 to 7.0.3][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.3 to 7.0.3][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-dev-certs**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-user-jwts**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] - **dotnet-user-secrets**: [from 7.0.3-servicing.23074.4 to 7.0.3-servicing.23080.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb06e943&targetVersion=GCfc6a47e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVers... --- NuGet.config | 13 +++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b6c0c5cd1..115e019e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - - + + - + + @@ -44,16 +45,16 @@ - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22bc43324..2f02139c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3102273b1819997a17c88dac78e89ac59052cdc2 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b06e943b6b17783dd21fe81cb2f914a7120f5349 + fc6a47e3e33b91bd2690161465db7a6c4149d480 diff --git a/eng/Versions.props b/eng/Versions.props index 8edaa4367..a4a3322b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.3 7.0.3 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 - 7.0.3-servicing.23074.4 + 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 @@ -64,8 +64,8 @@ 7.0.200 - 7.0.200-rtm.23075.12 - 7.0.200-rtm.23075.12 + 7.0.200-rtm.23080.7 + 7.0.200-rtm.23080.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 41a85aa01de9c5ec2a4303f9a2c356da728614f3 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 2 Feb 2023 13:06:10 -0600 Subject: [PATCH 141/864] 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 142/864] 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 143/864] 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 144/864] 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 145/864] 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 146/864] 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 147/864] 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 148/864] 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 149/864] 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 9171b0004c7a606626dee424d9e2fb91832b1bc6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Feb 2023 22:57:20 +0000 Subject: [PATCH 150/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23107.14 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 287683d61..6e57719c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,29 @@ + + + + + + + + + @@ -42,16 +51,23 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68c4766c5..8b856879f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f111ce1a19301c2258920ba362206837c5ef8b0 + 853207eccdf934d96f6bc28f80e2594c512d150c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f111ce1a19301c2258920ba362206837c5ef8b0 + 853207eccdf934d96f6bc28f80e2594c512d150c diff --git a/eng/Versions.props b/eng/Versions.props index 0f6df721d..49e7ce937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23074.26 - 6.0.114-servicing.23074.26 + 6.0.115-servicing.23107.14 + 6.0.115-servicing.23107.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) 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 151/864] 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 33ef3b27ee7a70e3ca8b0dbf63111ad6c2d36793 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:01:58 -0800 Subject: [PATCH 152/864] Update branding to 7.0.201 (#15465) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b1d59f38..6ffd9de52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From 535d6f657c1d8470aa69259379566bc3cf0b107f Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:15:41 +0100 Subject: [PATCH 153/864] [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 f1da1277032f4d5321087a1dc7e357d6ae22b35d Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:16:13 +0100 Subject: [PATCH 154/864] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15322) Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- 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 + .../source-build-reference-packages.proj | 2 -- 5 files changed, 45 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6ffd9de52..2e5be79b4 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 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 f0a9fa30d32d5a603790979ff3ac135c42792b53 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 00:53:26 +0100 Subject: [PATCH 155/864] [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 a947cadc652b564e0ba066de688353dbc5ab772e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 01:24:44 +0000 Subject: [PATCH 156/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.103 -> To Version 7.0.104 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad090420b..8b49ec0f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -19,12 +23,15 @@ + - + + + @@ -48,16 +55,21 @@ + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9aa70ccdb..705950b96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced1028bbbf0ce31e736e0e9d137a1b690fbb50d + 40d7a365c1747fb501a3ac6ac61631c717cd36c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced1028bbbf0ce31e736e0e9d137a1b690fbb50d + 40d7a365c1747fb501a3ac6ac61631c717cd36c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced1028bbbf0ce31e736e0e9d137a1b690fbb50d + 40d7a365c1747fb501a3ac6ac61631c717cd36c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced1028bbbf0ce31e736e0e9d137a1b690fbb50d + 40d7a365c1747fb501a3ac6ac61631c717cd36c6 diff --git a/eng/Versions.props b/eng/Versions.props index f7874947f..d9d4661cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.103 - 7.0.103-servicing.23080.6 - 7.0.103-servicing.23080.6 + 7.0.104 + 7.0.104-servicing.23107.26 + 7.0.104-servicing.23107.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ae99b3d9d3a4d4184b7643fe8d8d62a198f1898 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 01:28:49 +0000 Subject: [PATCH 157/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23107.25 --- 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 8b856879f..6f2082867 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853207eccdf934d96f6bc28f80e2594c512d150c + ad93e74b65b509fe7ffbfa08017c7ff155b677d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853207eccdf934d96f6bc28f80e2594c512d150c + ad93e74b65b509fe7ffbfa08017c7ff155b677d0 diff --git a/eng/Versions.props b/eng/Versions.props index 49e7ce937..4601760e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23107.14 - 6.0.115-servicing.23107.14 + 6.0.115-servicing.23107.25 + 6.0.115-servicing.23107.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9002061f3256560ec696496403e1defcbd5988b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 03:13:42 +0000 Subject: [PATCH 158/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.103 -> To Version 7.0.104 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b49ec0f5..6f7fae321 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 705950b96..0978dc307 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40d7a365c1747fb501a3ac6ac61631c717cd36c6 + 137f8800c6221f17c0a79e54df20e36df7374be2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40d7a365c1747fb501a3ac6ac61631c717cd36c6 + 137f8800c6221f17c0a79e54df20e36df7374be2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40d7a365c1747fb501a3ac6ac61631c717cd36c6 + 137f8800c6221f17c0a79e54df20e36df7374be2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40d7a365c1747fb501a3ac6ac61631c717cd36c6 + 137f8800c6221f17c0a79e54df20e36df7374be2 diff --git a/eng/Versions.props b/eng/Versions.props index d9d4661cf..81e7a14c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23107.26 - 7.0.104-servicing.23107.26 + 7.0.104-servicing.23107.36 + 7.0.104-servicing.23107.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 01c5db31cec307b3c2e4e06ef4e21dc2097d435e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 03:23:43 +0000 Subject: [PATCH 159/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23107.38 --- 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 6f2082867..3c9b8934d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad93e74b65b509fe7ffbfa08017c7ff155b677d0 + 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad93e74b65b509fe7ffbfa08017c7ff155b677d0 + 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 diff --git a/eng/Versions.props b/eng/Versions.props index 4601760e5..a3bcca54d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23107.25 - 6.0.115-servicing.23107.25 + 6.0.115-servicing.23107.38 + 6.0.115-servicing.23107.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a50f7c19b3add0d0474774654604cae8ba609bdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Feb 2023 07:08:12 +0000 Subject: [PATCH 160/864] Update dependencies from https://github.com/dotnet/sdk build 20230207.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.31 -> To Version 7.0.300-preview.23107.47 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23107-03 -> To Version 17.6.0-preview-23108-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 f9d984655..beeca8362 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be - + https://github.com/dotnet/sdk - 7cf2971bbbb10e81befb250c13b7e8be3ccf2ae6 + ad096f173ce6922b9217bb277e74a36a4d3730be @@ -149,9 +149,9 @@ 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de - + https://github.com/dotnet/msbuild - 446f42e6d1478acb44faec787f90f57f38c08b73 + c3541c6a284e10eacd615e2f9568c9f484a0b417 diff --git a/eng/Versions.props b/eng/Versions.props index 1c824753c..e88bf449f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.31 - 7.0.300-preview.23107.31 - 7.0.300-preview.23107.31 + 7.0.300-preview.23107.47 + 7.0.300-preview.23107.47 + 7.0.300-preview.23107.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8695202b96c0b5d495a9efc0be2d9d1804fd4048 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 10:19:11 +0000 Subject: [PATCH 161/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230208.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.103 -> To Version 7.0.104 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.23068.5 -> To Version 4.4.0-6.23101.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f7fae321..c023900e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0978dc307..9ee1b85af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 137f8800c6221f17c0a79e54df20e36df7374be2 + d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 137f8800c6221f17c0a79e54df20e36df7374be2 + d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 137f8800c6221f17c0a79e54df20e36df7374be2 + d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 137f8800c6221f17c0a79e54df20e36df7374be2 + d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 0760f14ebbc4a4f2a4fa282994d9e43b49f9795c + 528676cdbf0bfcfdb9372dc57a047dd0edc6d4db diff --git a/eng/Versions.props b/eng/Versions.props index 81e7a14c4..69267d478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23107.36 - 7.0.104-servicing.23107.36 + 7.0.104-servicing.23108.9 + 7.0.104-servicing.23108.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b9ae4165224430a86d6d5b316bcc95e9b704cb6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 8 Feb 2023 23:21:49 +0100 Subject: [PATCH 162/864] [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 b26aedc19d5c3f002c16ce0e875124b5b782e8bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 00:19:49 +0000 Subject: [PATCH 163/864] Update dependencies from https://github.com/dotnet/sdk build 20230208.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23107.47 -> To Version 7.0.300-preview.23108.34 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23106.7 -> To Version 12.5.0-beta.23108.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 8 ++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beeca8362..0165258b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 - + https://github.com/dotnet/sdk - ad096f173ce6922b9217bb277e74a36a4d3730be + 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - 85d67695a7a01397501216d54eec979d7d296bdb + f119868280da3cea22db8e6f85d24252f605db4c @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de + 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 - + https://github.com/dotnet/msbuild - c3541c6a284e10eacd615e2f9568c9f484a0b417 + 51df47643a8ee2715ac67fab8d652b25be070cd2 diff --git a/eng/Versions.props b/eng/Versions.props index e88bf449f..27dbee468 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23107.47 - 7.0.300-preview.23107.47 - 7.0.300-preview.23107.47 + 7.0.300-preview.23108.34 + 7.0.300-preview.23108.34 + 7.0.300-preview.23108.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230206-01 + 17.6.0-preview-20230208-02 From 0d4b7ea4959f2392c3c014da135456bd693b818c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 02:13:09 +0000 Subject: [PATCH 164/864] [release/7.0.3xx] Update dependencies from dotnet/arcade (#15486) [release/7.0.3xx] Update dependencies from dotnet/arcade --- 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 | 4 +- 13 files changed, 163 insertions(+), 53 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0165258b0..10217eb14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - 5f8519337c864af63b8692754ca0fa971bfc55d4 + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 27dbee468..5464d7f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23073.6 + 7.0.0-beta.23108.1 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 0d15a2c1f..40e2f263c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23073.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23073.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" } } From cec8d235e1de0a050a59e291c35f785121e82b00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Feb 2023 04:30:26 +0000 Subject: [PATCH 165/864] Update dependencies from https://github.com/dotnet/sdk build 20230208.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23108.34 -> To Version 7.0.300-preview.23108.40 --- 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 10217eb14..c20033102 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 - + https://github.com/dotnet/sdk - 503264c7c0ea61ebcf305c2d0e0a0837e6a73570 + 31945c5e5c1e85e289efd3d222fd9f76b42a3293 diff --git a/eng/Versions.props b/eng/Versions.props index 5464d7f6a..398caf899 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23108.34 - 7.0.300-preview.23108.34 - 7.0.300-preview.23108.34 + 7.0.300-preview.23108.40 + 7.0.300-preview.23108.40 + 7.0.300-preview.23108.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83d785ccfb755e51b3dfb9b388ea46dc47020a12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:35:31 -0800 Subject: [PATCH 166/864] [release/7.0.2xx] Update dependencies from dotnet/arcade (#15332) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 96 +++++++++--------- eng/Versions.props | 44 ++++---- 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 | 4 +- 13 files changed, 226 insertions(+), 116 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4901444ee..9d76a5c04 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 + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -116,13 +116,13 @@ 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + e83409daa530605da4eb5f847c6740a520325d25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df04c57b2e2bb986f0afc2384cbebb3c950447b5 + 636e2b7a00a434a354a126f510a56e16ce3c6bbc https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2e5be79b4..a1d3aaff8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,15 +27,15 @@ - 7.0.0-beta.23060.4 + 7.0.0-beta.23108.1 - 7.0.2-servicing.22606.8 + 7.0.0-rtm.22518.7 - 7.0.2-servicing.22606.2 + 7.0.0-rtm.22518.2 @@ -50,13 +50,13 @@ - 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.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 @@ -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.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.2-servicing.22607.1 - 7.0.2-servicing.22607.1 - 7.0.2 - 7.0.2 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 + 7.0.0 + 7.0.0 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.2 - 7.0.2 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 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..40e2f263c 100644 --- a/global.json +++ b/global.json @@ -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.23108.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" } } From 2b9f6c2591531d9ea4771a5f3795660d48e18ae2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:14:25 -0800 Subject: [PATCH 167/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15502) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c20033102..a127c62c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 - + https://github.com/dotnet/sdk - 31945c5e5c1e85e289efd3d222fd9f76b42a3293 + f42306939dc8f93312e5d9ab8718d64d0536e6a7 @@ -133,9 +133,9 @@ 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - f119868280da3cea22db8e6f85d24252f605db4c + d104dca228e7e71ec5bf4119b8ef0ed3e8ebb3e8 diff --git a/eng/Versions.props b/eng/Versions.props index 454395ce3..dc445dccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23108.40 - 7.0.300-preview.23108.40 - 7.0.300-preview.23108.40 + 7.0.300-preview.23109.8 + 7.0.300-preview.23109.8 + 7.0.300-preview.23109.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230208-02 + 17.6.0-preview-20230209-01 From 0709aa684bebd00a44d298d05db8c86d23f9f192 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 9 Feb 2023 16:08:09 -0800 Subject: [PATCH 168/864] [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 e2c796b8c1c07902c474daf30964ba360dcb705d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 9 Feb 2023 16:08:19 -0800 Subject: [PATCH 169/864] [release/7.0.2xx] Update checksum generation order (#15397) (#15482) 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 b3789cb0af2035280ee9f1272bb6069fd388f16f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 04:02:48 +0000 Subject: [PATCH 170/864] Update dependencies from https://github.com/dotnet/sdk build 20230209.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23109.8 -> To Version 7.0.300-preview.23109.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.3.136 -> To Version 6.6.0-preview.2.19 (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 a127c62c6..35faafb66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 - + https://github.com/dotnet/sdk - f42306939dc8f93312e5d9ab8718d64d0536e6a7 + 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 @@ -154,9 +154,9 @@ 51df47643a8ee2715ac67fab8d652b25be070cd2 - + https://github.com/nuget/nuget.client - 743503cb3c7e9ced2602ee2e29c38d63cc339451 + 8dec976a1ae4f80c82b3007cd8a5c80bdc8f3b22 diff --git a/eng/Versions.props b/eng/Versions.props index dc445dccc..6ee820262 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.8 - 7.0.300-preview.23109.8 - 7.0.300-preview.23109.8 + 7.0.300-preview.23109.17 + 7.0.300-preview.23109.17 + 7.0.300-preview.23109.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 942fb3b51e3c92ee10a3279e12514c9e30eda25a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 09:07:52 +0000 Subject: [PATCH 171/864] Update dependencies from https://github.com/dotnet/sdk build 20230209.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23109.17 -> To Version 7.0.300-preview.23109.26 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-1.23107.10 -> To Version 4.6.0-1.23109.10 (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 35faafb66..6cce43f33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd - + https://github.com/dotnet/sdk - 90e1a1dbfc21370102c5cd4c125232cc184d8ca1 + 10095975bc381f67b4321c275d057d401f11d2dd @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 + 73338d92270b9f26982eca2e8872037a0214b912 diff --git a/eng/Versions.props b/eng/Versions.props index 6ee820262..f4ecd0fe6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.17 - 7.0.300-preview.23109.17 - 7.0.300-preview.23109.17 + 7.0.300-preview.23109.26 + 7.0.300-preview.23109.26 + 7.0.300-preview.23109.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 702bf607ccbb1a5a860bbbedc06a31bbd393e8da Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 11 Feb 2023 00:49:21 +0100 Subject: [PATCH 172/864] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15506) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell 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 11315562cf13f1cf19837e61cd5da050cb0c2b6a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 11 Feb 2023 00:57:40 +0100 Subject: [PATCH 173/864] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15472) Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet-Bot 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 --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml 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..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 @@ - - + + 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..02641873b 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: @@ -7,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 diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 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/ @@ -99,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 691ac162a03a5fc9b5b580010bbc5ae3609bc20c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 23:58:39 +0000 Subject: [PATCH 174/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15510) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230209-01 to 17.6.0-preview-20230210-01 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23108-10 to 17.6.0-preview-23110-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cce43f33..d2fa98b93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 - + https://github.com/dotnet/sdk - 10095975bc381f67b4321c275d057d401f11d2dd + 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 @@ -133,9 +133,9 @@ 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa - + https://github.com/microsoft/vstest - d104dca228e7e71ec5bf4119b8ef0ed3e8ebb3e8 + 2066cbb384f6d0fa6fd36963b1db78f86f598800 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 51df47643a8ee2715ac67fab8d652b25be070cd2 + 81877bd58d0f1efa2ce2d194ebaf545a84f74aba diff --git a/eng/Versions.props b/eng/Versions.props index f4ecd0fe6..99646269c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23109.26 - 7.0.300-preview.23109.26 - 7.0.300-preview.23109.26 + 7.0.300-preview.23110.8 + 7.0.300-preview.23110.8 + 7.0.300-preview.23110.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230209-01 + 17.6.0-preview-20230210-01 From e610a0a26a4bbd59d014a59c5d4b9a29bdfb49f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Feb 2023 01:24:10 +0000 Subject: [PATCH 175/864] Update dependencies from https://github.com/dotnet/sdk build 20230210.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23110.8 -> To Version 7.0.300-preview.23110.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks From Version 12.5.0-beta.23108.3 -> To Version 12.5.0-beta.23110.2 (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 d2fa98b93..c9f658c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 - + https://github.com/dotnet/sdk - 974da24cfb4ca0ab7e166b5fa68c8a357bf71c01 + f6cd3735f6aa9d0c555e7fd0271692472ef63197 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa + 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 - + https://github.com/dotnet/fsharp - 2d21a15e1b23ab18ff2e57c0f2ec82fb0011e6aa + 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 @@ -138,9 +138,9 @@ 2066cbb384f6d0fa6fd36963b1db78f86f598800 - + https://github.com/dotnet/linker - de8bf14fcdfb55f2bae3db8cfc310ddd8ee921e6 + 19b53fbd053afc02fc20456d07d83fb8a94649c8 linker diff --git a/eng/Versions.props b/eng/Versions.props index 99646269c..d56cba3b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23110.8 - 7.0.300-preview.23110.8 - 7.0.300-preview.23110.8 + 7.0.300-preview.23110.18 + 7.0.300-preview.23110.18 + 7.0.300-preview.23110.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2222457da61c1a68407d027d3e00e8d26af93b0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 11 Feb 2023 01:34:27 +0000 Subject: [PATCH 176/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230210.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.104 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index c023900e3..be2336316 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ee1b85af..02beed9b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 + 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 + 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 + 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0c3306f6ab6680cbdec1cd64c2ca6a11b765598 + 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 diff --git a/eng/Versions.props b/eng/Versions.props index 69267d478..43873ab9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23108.9 - 7.0.104-servicing.23108.9 + 7.0.104-servicing.23110.19 + 7.0.104-servicing.23110.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb69dd8aa1b338a3b403ebd865c6be650e12fb39 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 11 Feb 2023 03:00:51 +0000 Subject: [PATCH 177/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230210.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.104 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 3 files changed, 61 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index be2336316..a9f1a8394 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,19 @@ - - - + - - - - - + - - + - + @@ -55,15 +48,12 @@ - - - + - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02beed9b4..ad4d03f71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 3f7b32f084f83f3161a0d3ca300c666d393044db - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 3f7b32f084f83f3161a0d3ca300c666d393044db - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 3f7b32f084f83f3161a0d3ca300c666d393044db - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 3f7b32f084f83f3161a0d3ca300c666d393044db - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 3f7b32f084f83f3161a0d3ca300c666d393044db - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 3f7b32f084f83f3161a0d3ca300c666d393044db @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + c9a33effb2f085e8a3ae576bc3b710033e32fa32 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 + 10bd9071435b61d4c84ca287dacf1562b3998a3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 + 10bd9071435b61d4c84ca287dacf1562b3998a3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 + 10bd9071435b61d4c84ca287dacf1562b3998a3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e9f8e54b0d37d182ebc479dbc5a500c7e069400 + 10bd9071435b61d4c84ca287dacf1562b3998a3c @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 43873ab9d..b50ead1e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,13 +50,13 @@ - 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 + 7.0.4 + 7.0.4 + 7.0.4-servicing.23108.8 + 7.0.4-servicing.23108.8 + 7.0.4-servicing.23108.8 + 7.0.4-servicing.23108.8 + 7.0.4-servicing.23108.8 0.2.0 @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23110.19 - 7.0.104-servicing.23110.19 + 7.0.104-servicing.23110.27 + 7.0.104-servicing.23110.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,12 +76,12 @@ - 7.0.3-servicing.23069.10 - 7.0.3-servicing.23069.10 - 7.0.3 - 7.0.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23109.15 + 7.0.4-servicing.23109.15 + 7.0.4 + 7.0.4 + 7.0.4 + 7.0.4 2.1.0 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.3 - 7.0.3 + 7.0.4 + 7.0.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 245921006df478431f33fac85042d05c35833160 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Feb 2023 02:30:51 +0000 Subject: [PATCH 178/864] Update dependencies from https://github.com/dotnet/sdk build 20230212.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23110.18 -> To Version 7.0.300-preview.23112.4 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230210-01 -> To Version 17.6.0-preview-20230210-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9f658c82..69ca43b54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 - + https://github.com/dotnet/sdk - f6cd3735f6aa9d0c555e7fd0271692472ef63197 + 01a16c392cf012af247f499d8f0de4734c107031 @@ -133,9 +133,9 @@ 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 - + https://github.com/microsoft/vstest - 2066cbb384f6d0fa6fd36963b1db78f86f598800 + e545c34442e27a97197d574bc00fcd0fc2eece39 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 81877bd58d0f1efa2ce2d194ebaf545a84f74aba + dba9b2343547c39971c92627476a926bf6f730bd diff --git a/eng/Versions.props b/eng/Versions.props index d56cba3b5..69af11272 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23110.18 - 7.0.300-preview.23110.18 - 7.0.300-preview.23110.18 + 7.0.300-preview.23112.4 + 7.0.300-preview.23112.4 + 7.0.300-preview.23112.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230210-01 + 17.6.0-preview-20230210-02 From 0004325188fe0c920870901208d774c8e9ff6753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 13 Feb 2023 12:43:27 +0100 Subject: [PATCH 179/864] Turn on debugging output for VMR synchronization (#15524) --- eng/pipelines/templates/steps/vmr-pull-updates.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 7756080bc..57814b994 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -36,5 +36,6 @@ steps: --target-ref ${{ parameters.targetRef }} --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt + --debug displayName: Synchronize dotnet/dotnet workingDirectory: $(Agent.BuildDirectory)/installer From 36bc76d421e9a85499b7725962768871c52aa246 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 13 Feb 2023 13:03:21 -0800 Subject: [PATCH 180/864] Update the coherency dependency to be the runtime and not the sdk for emsdk (#15516) --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6bff0c50..c00628761 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,16 +165,16 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 - + https://github.com/dotnet/emsdk 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 - + https://github.com/dotnet/emsdk 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 From 91caa7d21ca963502f8e624603c749d4bd129598 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 13 Feb 2023 22:50:32 +0100 Subject: [PATCH 181/864] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15514) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe 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: Daniel Plaisted --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml 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..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 @@ - - + + 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..02641873b 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: @@ -7,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 diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 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/ @@ -99,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 868b90e7878b6d03841fa14c5edca04f9c81328d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 13 Feb 2023 23:24:32 +0000 Subject: [PATCH 182/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230213.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.104 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9f1a8394..504f2a0b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -51,9 +51,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad4d03f71..ae612d773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f7b32f084f83f3161a0d3ca300c666d393044db + 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f7b32f084f83f3161a0d3ca300c666d393044db + 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f7b32f084f83f3161a0d3ca300c666d393044db + 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f7b32f084f83f3161a0d3ca300c666d393044db + 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f7b32f084f83f3161a0d3ca300c666d393044db + 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f7b32f084f83f3161a0d3ca300c666d393044db + 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10bd9071435b61d4c84ca287dacf1562b3998a3c + f2f862560a072ac958811a1e0124a74ab103f5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10bd9071435b61d4c84ca287dacf1562b3998a3c + f2f862560a072ac958811a1e0124a74ab103f5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10bd9071435b61d4c84ca287dacf1562b3998a3c + f2f862560a072ac958811a1e0124a74ab103f5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10bd9071435b61d4c84ca287dacf1562b3998a3c + f2f862560a072ac958811a1e0124a74ab103f5a2 diff --git a/eng/Versions.props b/eng/Versions.props index b50ead1e7..6dc39afb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23110.27 - 7.0.104-servicing.23110.27 + 7.0.104-servicing.23113.15 + 7.0.104-servicing.23113.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.4-servicing.23109.15 - 7.0.4-servicing.23109.15 + 7.0.4-servicing.23110.12 + 7.0.4-servicing.23110.12 7.0.4 7.0.4 7.0.4 From a598fe9e316960ed0bba37c0ea928cb3a1f7febe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 13 Feb 2023 23:49:44 +0000 Subject: [PATCH 183/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230213.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23113.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 3c9b8934d..886a88b9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 + f19fd7a42f9f609a169d0e509a5d192d3fc261c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 + f19fd7a42f9f609a169d0e509a5d192d3fc261c2 diff --git a/eng/Versions.props b/eng/Versions.props index a3bcca54d..75006a110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23107.38 - 6.0.115-servicing.23107.38 + 6.0.115-servicing.23113.20 + 6.0.115-servicing.23113.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f6cac26eee3d578abf69ce659f1441e48ddd5109 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 15:51:59 -0800 Subject: [PATCH 184/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15525) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69ca43b54..7337c48b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 - + https://github.com/dotnet/sdk - 01a16c392cf012af247f499d8f0de4734c107031 + 0633039bb303781170ce9ac2e57565b1f4d121e5 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 + 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/dotnet/fsharp - 3dd78b8325ffae266e5f19b37a6c4d863f9b8f30 + 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/microsoft/vstest - e545c34442e27a97197d574bc00fcd0fc2eece39 + b6a8c3b174380a5d57059428d8d3840915325373 @@ -154,9 +154,9 @@ dba9b2343547c39971c92627476a926bf6f730bd - + https://github.com/nuget/nuget.client - 8dec976a1ae4f80c82b3007cd8a5c80bdc8f3b22 + b84ca7373557c5725836697f81786ed22e20ead5 diff --git a/eng/Versions.props b/eng/Versions.props index 69af11272..106b9f3ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23112.4 - 7.0.300-preview.23112.4 - 7.0.300-preview.23112.4 + 7.0.300-preview.23113.14 + 7.0.300-preview.23113.14 + 7.0.300-preview.23113.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230210-02 + 17.6.0-preview-20230213-02 From 51603b07e3db9aa4221960c9fe540a05d5c5ac87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Feb 2023 00:17:18 +0000 Subject: [PATCH 185/864] Update dependencies from https://github.com/dotnet/sdk build 20230213.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23113.14 -> To Version 7.0.300-preview.23113.21 --- 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 7337c48b4..2d523d445 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 - + https://github.com/dotnet/sdk - 0633039bb303781170ce9ac2e57565b1f4d121e5 + 6d253cefc0cd96e51b5185cf65be05867311da54 diff --git a/eng/Versions.props b/eng/Versions.props index 106b9f3ef..f4a965777 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23113.14 - 7.0.300-preview.23113.14 - 7.0.300-preview.23113.14 + 7.0.300-preview.23113.21 + 7.0.300-preview.23113.21 + 7.0.300-preview.23113.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7da88e07cc45e5da7e7ba71cf707ad9942ee7efb Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:06:02 +0100 Subject: [PATCH 186/864] add tests for covering adding item templates (C# and VB) (#15343) --- test/EndToEnd/ProjectBuildTests.cs | 85 ++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index ec6684750..a19309b52 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -115,7 +116,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string publishArgs="-r win-arm64"; + string publishArgs = "-r win-arm64"; new PublishCommand() .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) @@ -149,7 +150,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - string publishArgs="-r win-arm64"; + string publishArgs = "-r win-arm64"; new PublishCommand() .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) @@ -248,6 +249,47 @@ namespace EndToEnd.Tests Assert.True(directory.EnumerateFileSystemInfos().Any()); } + [Theory] + // microsoft.dotnet.common.itemtemplates templates + [InlineData("class")] + [InlineData("struct")] + [InlineData("enum")] + [InlineData("record")] + [InlineData("interface")] + [InlineData("class", "C#")] + [InlineData("class", "VB")] + [InlineData("struct", "VB")] + [InlineData("enum", "VB")] + [InlineData("interface", "VB")] + public void ItCanCreateItemTemplateWithProjectRestriction(string templateName, string language = "") + { + var languageExtensionMap = new Dictionary() + { + { "", ".cs" }, + { "C#", ".cs" }, + { "VB", ".vb" } + }; + + DirectoryInfo directory = InstantiateProjectTemplate("classlib", language, withNoRestore: false); + string projectDirectory = directory.FullName; + string expectedItemName = $"TestItem_{templateName}"; + string newArgs = $"{templateName} --name {expectedItemName} --debug:ephemeral-hive"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + //check if the template created files + Assert.True(directory.Exists); + Assert.True(directory.EnumerateFileSystemInfos().Any()); + Assert.True(directory.GetFile($"{expectedItemName}.{languageExtensionMap[language]}") != null); + } + [WindowsOnlyTheory] [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")] @@ -402,20 +444,9 @@ namespace EndToEnd.Tests private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "") { - DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); + DirectoryInfo directory = InstantiateProjectTemplate(templateName, language); string projectDirectory = directory.FullName; - string newArgs = $"{templateName} --debug:ephemeral-hive --no-restore"; - if (!string.IsNullOrWhiteSpace(language)) - { - newArgs += $" --language {language}"; - } - - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute(newArgs) - .Should().Pass(); - if (!string.IsNullOrWhiteSpace(framework)) { //check if MSBuild TargetFramework property for *proj is set to expected framework @@ -439,13 +470,13 @@ namespace EndToEnd.Tests { buildArgs += $" --framework {framework}"; } - + // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved. if (language == "F#") { buildArgs += $" /p:_NETCoreSdkIsPreview=true"; } - + string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet @@ -454,5 +485,27 @@ namespace EndToEnd.Tests .Should().Pass(); } } + + private static DirectoryInfo InstantiateProjectTemplate(string templateName, string language = "", bool withNoRestore = true) + { + DirectoryInfo directory = TestAssets.CreateTestDirectory( + identifier: string.IsNullOrWhiteSpace(language) + ? templateName + : $"{templateName}[{language}]"); + string projectDirectory = directory.FullName; + + string newArgs = $"{templateName} --debug:ephemeral-hive {(withNoRestore ? "--no-restore" : "")}"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + return directory; + } } } From 975f12e9e8f5906daebadc89f762cbc915b08f24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 09:53:16 -0800 Subject: [PATCH 187/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15531) 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 2d523d445..92e76677c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 - + https://github.com/dotnet/sdk - 6d253cefc0cd96e51b5185cf65be05867311da54 + 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dba9b2343547c39971c92627476a926bf6f730bd + 03de075bf00cadc8cf6e884f1719ea1d2da5b30e diff --git a/eng/Versions.props b/eng/Versions.props index f4a965777..f811a41e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23113.21 - 7.0.300-preview.23113.21 - 7.0.300-preview.23113.21 + 7.0.300-preview.23114.3 + 7.0.300-preview.23114.3 + 7.0.300-preview.23114.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6059f9bcac5e1408e4c587e5cfede40938432e97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Feb 2023 19:17:16 +0000 Subject: [PATCH 188/864] Update dependencies from https://github.com/dotnet/sdk build 20230214.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23114.3 -> To Version 7.0.300-preview.23114.6 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230213-02 -> To Version 17.6.0-preview-20230213-04 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92e76677c..43a9007a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 - + https://github.com/dotnet/sdk - 4e4430ad46b25f14b7e0d31df4d12dab1c2d5bc5 + 8e4346a910549b1221c24bec7bc2fdff17367293 @@ -133,9 +133,9 @@ 3263ac15552940d944b4bff27547022ade3da16a - + https://github.com/microsoft/vstest - b6a8c3b174380a5d57059428d8d3840915325373 + 4bb2af558ce5bea6b8822135fa88fa6ae035b408 diff --git a/eng/Versions.props b/eng/Versions.props index f811a41e0..f2e3e9542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23114.3 - 7.0.300-preview.23114.3 - 7.0.300-preview.23114.3 + 7.0.300-preview.23114.6 + 7.0.300-preview.23114.6 + 7.0.300-preview.23114.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230213-02 + 17.6.0-preview-20230213-04 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 189/864] 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 190/864] 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 191/864] 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 192/864] 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 3cc0821abb05a202fe6d59ec9aba5ab9e1d43be9 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:55:20 -0800 Subject: [PATCH 193/864] Merging internal commits for release/7.0.2xx (#15537) Co-authored-by: DotNet Bot Co-authored-by: Matt Mitchell --- NuGet.config | 15 +++ eng/Version.Details.xml | 120 +++++++++--------- eng/Versions.props | 48 +++---- ...solvePackageFileConflicts-workaround.patch | 23 ---- 4 files changed, 99 insertions(+), 107 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..115e019e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,23 @@ + + + + + + + + + @@ -36,11 +45,17 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d76a5c04..f142d42a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + e391694876e891d2cdc4089e62fe7b1138d8294e - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + e391694876e891d2cdc4089e62fe7b1138d8294e @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a1d3aaff8..e602baaa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.3-servicing.23072.1 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.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.200-preview.23063.9 - 7.0.200-preview.23063.9 - 7.0.200-preview.23063.9 + 7.0.200 + 7.0.200-rtm.23080.7 + 7.0.200-rtm.23080.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.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.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 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.0 - 7.0.0 + 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 721a0805806a991d1b6509430a4b99dcf3447bb2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Feb 2023 22:59:01 +0000 Subject: [PATCH 194/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230214.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23114.12 --- NuGet.config | 3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e57719c6..5c5764a43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,9 +12,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 886a88b9d..4e35d502d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f19fd7a42f9f609a169d0e509a5d192d3fc261c2 + e4e740daa15030398b9359046a4724fbcb6542f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f19fd7a42f9f609a169d0e509a5d192d3fc261c2 + e4e740daa15030398b9359046a4724fbcb6542f3 diff --git a/eng/Versions.props b/eng/Versions.props index 75006a110..b398591da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23113.20 - 6.0.115-servicing.23113.20 + 6.0.115-servicing.23114.12 + 6.0.115-servicing.23114.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be68c22f223290092b76931a70e7d89751b52a42 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Feb 2023 23:48:58 +0000 Subject: [PATCH 195/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230214.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.104 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 504f2a0b9..5d7e88763 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae612d773..07e9e59d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f862560a072ac958811a1e0124a74ab103f5a2 + 7155204567f83c3e586c9c69694ec7e36b68f4b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f862560a072ac958811a1e0124a74ab103f5a2 + 7155204567f83c3e586c9c69694ec7e36b68f4b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f862560a072ac958811a1e0124a74ab103f5a2 + 7155204567f83c3e586c9c69694ec7e36b68f4b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f862560a072ac958811a1e0124a74ab103f5a2 + 7155204567f83c3e586c9c69694ec7e36b68f4b2 diff --git a/eng/Versions.props b/eng/Versions.props index 6dc39afb4..999ccf117 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23113.15 - 7.0.104-servicing.23113.15 + 7.0.104-servicing.23114.16 + 7.0.104-servicing.23114.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db2e7bac4f6fc44212bc792714974209d28db39f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 Feb 2023 16:35:54 -0800 Subject: [PATCH 196/864] Change how VS setup authoring is configured. --- src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 03e407b2e..7ce25b785 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Cli.Build foreach (var file in files) { - sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); + sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.AppendLine("\""); } From 920b57b9202706724e42891af8c4773eae9298f0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:51:47 -0800 Subject: [PATCH 197/864] [release/7.0.3xx] Bump ASP.NET template versions (#15546) - regular 6.0.x update - noticed we serviced the 3.0.x template but didn't reflect that here --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f2e3e9542..f28f3a89d 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 1cdfc9ce47498fdb11851d89979c547f5f67323b Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 15 Feb 2023 01:59:01 +0100 Subject: [PATCH 198/864] [automated] Merge branch 'release/7.0.3xx' => 'main' (#15513) Co-authored-by: Antoine Martin Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons Co-authored-by: Chris Rummel Co-authored-by: Marc Paine Co-authored-by: Logan Bussell Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell --- eng/common/templates/variables/pool-providers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 9cc5c550d..99c80212b 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,17 +1,17 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# 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. +# (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 it can be added to the condition below. +# 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.: # From 2b6a12615fd9bfbf38fc2023442203e33abd0de2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:59:10 -0800 Subject: [PATCH 199/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15545) Co-authored-by: dotnet-maestro[bot] --- 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 43a9007a0..facb64304 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 - + https://github.com/dotnet/sdk - 8e4346a910549b1221c24bec7bc2fdff17367293 + 758db962ccbfa4526798159135034b30209dc454 diff --git a/eng/Versions.props b/eng/Versions.props index f28f3a89d..03c93d912 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23114.6 - 7.0.300-preview.23114.6 - 7.0.300-preview.23114.6 + 7.0.300-preview.23114.15 + 7.0.300-preview.23114.15 + 7.0.300-preview.23114.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) 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 200/864] [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 201/864] [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 bbcbae4320bf7379fd70d6709dd5c1b88dbf860f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:36:39 -0800 Subject: [PATCH 202/864] [release/7.0.2xx] Bump ASP.NET template versions (#15547) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e602baaa4..c7cab947c 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 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 203/864] [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 37e9919a75a7cb445a4099f2ea702ce7e2df86b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Feb 2023 02:06:06 +0000 Subject: [PATCH 204/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230214.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.115-servicing.23114.12 -> To Version 6.0.115-servicing.23114.25 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.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,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.14 -> To Version 6.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 31 +++++---------- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 74 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c5764a43..3d233477a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,21 @@ - - - + + - - + - - - + - - - + @@ -48,24 +42,17 @@ - - - + - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e35d502d..0df6137f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 629fc1a8b3d53b551ea512c4f0294062dcd30afe + 00c7c6fea7bbe254a7612a19f751bc271df05f68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 629fc1a8b3d53b551ea512c4f0294062dcd30afe + 00c7c6fea7bbe254a7612a19f751bc271df05f68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 629fc1a8b3d53b551ea512c4f0294062dcd30afe + 00c7c6fea7bbe254a7612a19f751bc271df05f68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4e740daa15030398b9359046a4724fbcb6542f3 + a50126e69a034f5a6e0663afad31ffc492da283c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4e740daa15030398b9359046a4724fbcb6542f3 + a50126e69a034f5a6e0663afad31ffc492da283c @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 9f2e9f6ec690ad8f4aea16b33f4a4bcc11b3d2cb + 0d02a9fc71d6e5da74daac3a136042f3790283b2 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index b398591da..90ac6f215 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.114 + 6.0.115 @@ -44,20 +44,20 @@ - 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 + 6.0.15 + 6.0.15 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 0.2.0 - 6.0.115-servicing.23114.12 - 6.0.115-servicing.23114.12 + 6.0.115-servicing.23114.25 + 6.0.115-servicing.23114.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 + 6.0.15 + 6.0.15 + 6.0.15 + 6.0.15 2.1.0 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23110.5 + 6.0.15-servicing.23110.5 + 6.0.15 + 6.0.15 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.114 + 6.0.115 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.14 + 6.0.15 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From ab3f98be97814cd294cfc161840d5838d8dd4e66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Feb 2023 04:59:40 +0000 Subject: [PATCH 205/864] Update dependencies from https://github.com/dotnet/arcade build 20230214.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23108.1 -> To Version 7.0.0-beta.23114.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index facb64304..9bc540e9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,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 03c93d912..ea898f695 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 5c0c4649b293c8e42a38b5f23fc86ffe442bb5e1 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 15 Feb 2023 08:55:43 -0800 Subject: [PATCH 206/864] [release/6.0.1xx] Bump missed ASP.NET template version (#15551) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0f6df721d..578a07565 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 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 207/864] [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 e8cc836063fbb874a8b3b8658ec7ec81ddcc5dea Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:03:10 -0800 Subject: [PATCH 208/864] [main] Bump ASP.NET versions (#15558) --- eng/Versions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 71d486bcd..d9e3f75cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,8 +117,8 @@ 6.0.302 7.0.100 5.0.17 - 6.0.11 - 7.0.0 + 6.0.14 + 7.0.3 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -147,14 +147,14 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates70PackageVersion) $(MicrosoftDotNetCommonItemTemplates70PackageVersion) - 7.0.2 + 7.0.3 $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -176,7 +176,7 @@ 1.6.5 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From 5f707cf2b1cf29c7f187a370e9ca9662608b0f23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Feb 2023 22:50:29 +0000 Subject: [PATCH 209/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230215.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.115-servicing.23114.12 -> To Version 6.0.115-servicing.23115.29 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,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.14 -> To Version 6.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++----- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d233477a..9d6950b95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,13 +15,13 @@ - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0df6137f5..7d7f39462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00c7c6fea7bbe254a7612a19f751bc271df05f68 + 46ea183f02224e86675f0936217d1a554f3c506c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00c7c6fea7bbe254a7612a19f751bc271df05f68 + 46ea183f02224e86675f0936217d1a554f3c506c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00c7c6fea7bbe254a7612a19f751bc271df05f68 + 46ea183f02224e86675f0936217d1a554f3c506c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a50126e69a034f5a6e0663afad31ffc492da283c + d59c8088920f1956fd606cab7f40af52b747abdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a50126e69a034f5a6e0663afad31ffc492da283c + d59c8088920f1956fd606cab7f40af52b747abdf diff --git a/eng/Versions.props b/eng/Versions.props index 90ac6f215..69a0c826c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,30 +46,30 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.14 + 6.0.15-servicing.23114.14 + 6.0.15-servicing.23114.14 + 6.0.15-servicing.23114.14 0.2.0 - 6.0.115-servicing.23114.25 - 6.0.115-servicing.23114.25 + 6.0.115-servicing.23115.29 + 6.0.115-servicing.23115.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.7 + 6.0.8 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.15 + 6.0.15-servicing.23114.15 6.0.15 6.0.15 6.0.15 @@ -78,8 +78,8 @@ - 6.0.15-servicing.23110.5 - 6.0.15-servicing.23110.5 + 6.0.15-servicing.23115.10 + 6.0.15-servicing.23115.10 6.0.15 6.0.15 From 706b44879da7f4731a50982700a8b7a0b61943b5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Feb 2023 23:05:19 +0000 Subject: [PATCH 210/864] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230215.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.104 -> To Version 7.0.104 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++--------- eng/Version.Details.xml | 70 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++-------- 3 files changed, 56 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5d7e88763..700590676 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,17 +16,13 @@ - + - + - - - - - + @@ -48,19 +44,15 @@ - + - + - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e9e59d6..7839d5e25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab + dcb489a49c7b4a229e3e6d02d393a48105742c06 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab + dcb489a49c7b4a229e3e6d02d393a48105742c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab + dcb489a49c7b4a229e3e6d02d393a48105742c06 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab + dcb489a49c7b4a229e3e6d02d393a48105742c06 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab + dcb489a49c7b4a229e3e6d02d393a48105742c06 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55768a20adaa1b5a9158cf3cfdc2f8733ddf43ab + dcb489a49c7b4a229e3e6d02d393a48105742c06 @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9a33effb2f085e8a3ae576bc3b710033e32fa32 + cbb5992f76fadb3fcd8d90897f3f644bd162e365 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7155204567f83c3e586c9c69694ec7e36b68f4b2 + 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7155204567f83c3e586c9c69694ec7e36b68f4b2 + 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7155204567f83c3e586c9c69694ec7e36b68f4b2 + 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7155204567f83c3e586c9c69694ec7e36b68f4b2 + 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 diff --git a/eng/Versions.props b/eng/Versions.props index 999ccf117..e84f8d7e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.4 7.0.4 - 7.0.4-servicing.23108.8 - 7.0.4-servicing.23108.8 - 7.0.4-servicing.23108.8 - 7.0.4-servicing.23108.8 - 7.0.4-servicing.23108.8 + 7.0.4-servicing.23113.13 + 7.0.4-servicing.23113.13 + 7.0.4-servicing.23113.13 + 7.0.4-servicing.23113.13 + 7.0.4-servicing.23113.13 0.2.0 @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23114.16 - 7.0.104-servicing.23114.16 + 7.0.104-servicing.23115.28 + 7.0.104-servicing.23115.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 7.0.4-servicing.23110.12 - 7.0.4-servicing.23110.12 + 7.0.4-servicing.23114.5 + 7.0.4-servicing.23114.5 7.0.4 7.0.4 7.0.4 @@ -86,10 +86,10 @@ - 7.0.3-servicing.23073.3 - 7.0.3-servicing.23073.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23115.7 + 7.0.4-servicing.23115.7 + 7.0.4 + 7.0.4 From 3367e1f22d0bbfe38485b626bc8c6a21cd1504e8 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 15 Feb 2023 18:34:42 -0800 Subject: [PATCH 211/864] Revert changes that do not applicable in main --- .../content/eng/bootstrap/OverrideBootstrapVersions.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props index ced02e960..d0a05029f 100644 --- a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -7,9 +7,5 @@ $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) - - 7.0.0 - 7.0.0 - 7.0.0 From e52c7c37de9399d9f6333e4be08671ac11981f53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 02:46:31 +0000 Subject: [PATCH 212/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15555) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22518.7 to 7.0.3-servicing.23072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22518.2 to 7.0.3-servicing.23073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23113.3 to 12.5.0-beta.23114.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23113.3 to 7.0.300-beta.23114.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230213-04 to 17.6.0-preview-20230214-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23110.2 to 7.0.100-1.23115.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23114-04 to 17.6.0-preview-23115-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.2.21 to 6.6.0-preview.2.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.0 to 7.0.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.0 to 7.0.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - Merge branch 'release/7.0.3xx' of https://github.com/dotnet/installer into darc-release/7.0.3xx-f01d7d5b-1d0f-4013-a849-a2d0a661b15b --- NuGet.config | 20 +++++++ eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++-------- 3 files changed, 107 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..0f14f7ff0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,24 @@ + + + + + + + + + + @@ -36,11 +46,21 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bc540e9b..e5ad729f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,49 +98,49 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 3263ac15552940d944b4bff27547022ade3da16a + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/dotnet/fsharp - 3263ac15552940d944b4bff27547022ade3da16a + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 4bb2af558ce5bea6b8822135fa88fa6ae035b408 + 4cf1986ee6f2c7ec42efdbbda84d16a0435f741b - + https://github.com/dotnet/linker - 19b53fbd053afc02fc20456d07d83fb8a94649c8 + 757da5c5adf9a6a9732285ccace1abf136be1370 linker @@ -149,27 +149,27 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 03de075bf00cadc8cf6e884f1719ea1d2da5b30e + dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 - + https://github.com/nuget/nuget.client - b84ca7373557c5725836697f81786ed22e20ead5 + 55728432057dc57733661fe01e9c8493ab5034f2 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ea898f695..943874c00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.3-servicing.23072.1 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.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.300-preview.23114.15 - 7.0.300-preview.23114.15 - 7.0.300-preview.23114.15 + 7.0.300-preview.23115.25 + 7.0.300-preview.23115.25 + 7.0.300-preview.23115.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.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.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 + 7.0.3 + 7.0.3 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230213-04 + 17.6.0-preview-20230214-01 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 32fca6aa857347d2a55a82081f43f7070c7ba3c5 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:06 -0800 Subject: [PATCH 213/864] [release/6.0.1xx] Update dependencies from dotnet/arcade (#15563) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 15 ++++++++++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 287683d61..5c5764a43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,26 @@ + + - + + + + + @@ -42,16 +48,23 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68c4766c5..670a12544 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 578a07565..303422517 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 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 214/864] [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 215/864] [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 0a561dc0d55956962bc6008fa5fc6368c7d080ac Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Feb 2023 10:48:46 -0600 Subject: [PATCH 216/864] Cleanup known-good source-build projects (#15527) --- src/SourceBuild/content/Directory.Build.props | 7 +- src/SourceBuild/content/build.proj | 7 -- .../generate-graphviz/generate-graphviz.proj | 4 +- .../content/repo-projects/dotnet.proj | 52 ++++++++++++ .../repo-projects/known-good-tests.proj | 37 --------- .../content/repo-projects/known-good.proj | 79 ------------------- 6 files changed, 54 insertions(+), 132 deletions(-) create mode 100644 src/SourceBuild/content/repo-projects/dotnet.proj delete mode 100644 src/SourceBuild/content/repo-projects/known-good-tests.proj delete mode 100644 src/SourceBuild/content/repo-projects/known-good.proj diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index c770efa5f..52b3c75b9 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -173,12 +173,7 @@ - - known-good - known-good-tests + dotnet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/known-good-tests.proj b/src/SourceBuild/content/repo-projects/known-good-tests.proj deleted file mode 100644 index e8d75dd4b..000000000 --- a/src/SourceBuild/content/repo-projects/known-good-tests.proj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SourceBuild/content/repo-projects/known-good.proj b/src/SourceBuild/content/repo-projects/known-good.proj deleted file mode 100644 index f01c73302..000000000 --- a/src/SourceBuild/content/repo-projects/known-good.proj +++ /dev/null @@ -1,79 +0,0 @@ - - - - - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 3a47d053d3e328c073fa72a8f8811d7eaf9fbda4 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:07:15 -0800 Subject: [PATCH 217/864] [main] Update dependencies from dotnet/sdk (#15564) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Eric Erhardt Co-authored-by: Michael Simons --- eng/Version.Details.xml | 136 +++++++++--------- eng/Versions.props | 54 +++---- .../WebScenarioTests.cs | 7 +- ...ld-to-set-UsingToolMicrosoftNetCompi.patch | 24 ---- 4 files changed, 99 insertions(+), 122 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-Allow-source-build-to-set-UsingToolMicrosoftNetCompi.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c00628761..8df827791 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 35e681744a6fa5a046983ae9de04f24f0e77e112 + 281bba092aec24d1b61d1cde7481d0b25c6b6e88 - + https://github.com/dotnet/windowsdesktop - 35e681744a6fa5a046983ae9de04f24f0e77e112 + 281bba092aec24d1b61d1cde7481d0b25c6b6e88 - + https://github.com/dotnet/windowsdesktop - 35e681744a6fa5a046983ae9de04f24f0e77e112 + 281bba092aec24d1b61d1cde7481d0b25c6b6e88 - + https://github.com/dotnet/windowsdesktop - 35e681744a6fa5a046983ae9de04f24f0e77e112 + 281bba092aec24d1b61d1cde7481d0b25c6b6e88 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b - + https://github.com/dotnet/aspnetcore - cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d + 6a7bcda42de7b98196b38924cc354216eba57c9b https://github.com/dotnet/test-templates @@ -102,81 +102,81 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 516144c596a27c1834b69cbd3bc26f6ab25e7c66 + 6ac256fd2d59b0f68655c50d65e8a1a2392a510a - + https://github.com/dotnet/sdk - 516144c596a27c1834b69cbd3bc26f6ab25e7c66 + 6ac256fd2d59b0f68655c50d65e8a1a2392a510a - + https://github.com/dotnet/sdk - 516144c596a27c1834b69cbd3bc26f6ab25e7c66 + 6ac256fd2d59b0f68655c50d65e8a1a2392a510a - + https://github.com/dotnet/sdk - 516144c596a27c1834b69cbd3bc26f6ab25e7c66 + 6ac256fd2d59b0f68655c50d65e8a1a2392a510a - + https://github.com/dotnet/winforms - 29484ddfbbb4c3fa931679a54dece607f94eff7a + 5f7876498859aaa16343ce546c0004ef778de830 - + https://github.com/dotnet/wpf - 22d2efb6a031c4dc9ecd51adc20806b7b35057eb + 01559f6a23310e1361adbc8916909088b7a45ce0 - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/dotnet/fsharp - 6e280448367a288c6d28d9c0a446302c4fb90e3f + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - ef449ea49d874b6415c0244d775f5e3a2f4e941f + 9da4e7f7505af42b34e1a2d7ba6857f98782025f - + https://github.com/dotnet/runtime - e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550 + 6dfc7d35c927d55b61b01b7c5131b8ea690be707 - + https://github.com/dotnet/roslyn - 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de + 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - fc3ab4c5e2a486abb8fc66aede7ec8e3eb91fe08 + dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 - + https://github.com/nuget/nuget.client - 419ab86c016778ee3aeab40ea6fee879c09c7365 + 55728432057dc57733661fe01e9c8493ab5034f2 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 + d7ff0aa47c680be543905cc1410e2f62b54dfefe - + https://github.com/dotnet/emsdk - 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 + a117e262c0c49e71a0017e96a0a1124ec990d05f - + https://github.com/dotnet/emsdk - 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 + a117e262c0c49e71a0017e96a0a1124ec990d05f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index d9e3f75cb..88135d1bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23080.8 + 8.0.0-preview.2.23114.8 - 8.0.0-preview.2.23105.1 + 8.0.0-preview.2.23114.3 @@ -58,46 +58,46 @@ - 8.0.0-preview.2.23107.2 - 8.0.0-preview.2.23107.2 - 8.0.0-preview.2.23107.2 - 8.0.0-preview.2.23107.2 - 8.0.0-preview.2.23107.2 - 8.0.0-preview.2.23107.2 - 8.0.0-preview.2.23107.2 + 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23115.12 0.2.0 - 8.0.100-preview.2.23107.8 - 8.0.100-preview.2.23107.8 - 8.0.100-preview.2.23107.8 + 8.0.100-preview.2.23116.2 + 8.0.100-preview.2.23116.2 + 8.0.100-preview.2.23116.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23107.1 + 8.0.0-preview.2.23115.9 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 + 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23115.9 2.1.0 - 8.0.0-preview.2.23106.1 - 8.0.0-preview.2.23106.1 - 8.0.0-preview.2.23106.1 - 8.0.0-preview.2.23106.1 + 8.0.0-preview.2.23115.1 + 8.0.0-preview.2.23115.1 + 8.0.0-preview.2.23115.1 + 8.0.0-preview.2.23115.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230202-02 + 17.6.0-preview-20230215-02 8.0.0-alpha.1.22557.12 @@ -200,9 +200,9 @@ 13.1.227-net8-p1 16.1.1015-net8-p1 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 - 8.0.0-preview.2.23107.1 + 8.0.0-preview.2.23113.1 + 8.0.0-preview.2.23108.1 + 8.0.0-preview.2.23108.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 56d0368f3..f7d0a87af 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -26,15 +26,16 @@ public class WebScenarioTests : SmokeTests private static IEnumerable GetScenarios() { + // TODO: Re-enable tests with https://github.com/dotnet/source-build/issues/3254 foreach (DotNetLanguage language in new[] { DotNetLanguage.CSharp, DotNetLanguage.FSharp }) { yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Web, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex); - yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; - yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + //yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; + //yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); } yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); - yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + //yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Angular); diff --git a/src/SourceBuild/patches/runtime/0001-Allow-source-build-to-set-UsingToolMicrosoftNetCompi.patch b/src/SourceBuild/patches/runtime/0001-Allow-source-build-to-set-UsingToolMicrosoftNetCompi.patch deleted file mode 100644 index 7e48a742d..000000000 --- a/src/SourceBuild/patches/runtime/0001-Allow-source-build-to-set-UsingToolMicrosoftNetCompi.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Wed, 25 Jan 2023 20:21:17 +0000 -Subject: [PATCH] Allow source-build to set UsingToolMicrosoftNetCompilers - property - -backport: https://github.com/dotnet/runtime/pull/81180 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index a57587c74a8..15f65bc269b 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -22,7 +22,7 @@ - false - false - $(AssemblyVersion) -- true -+ true - - - From 492415028e8d9079f5509ad7d07a9d8ba7b30ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:34:16 +0000 Subject: [PATCH 218/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15568) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230214-01 to 17.6.0-preview-20230215-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5ad729f7..348a0300f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 4cf1986ee6f2c7ec42efdbbda84d16a0435f741b + 9da4e7f7505af42b34e1a2d7ba6857f98782025f diff --git a/eng/Versions.props b/eng/Versions.props index 943874c00..a53949324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23115.25 - 7.0.300-preview.23115.25 - 7.0.300-preview.23115.25 + 7.0.300-preview.23116.3 + 7.0.300-preview.23116.3 + 7.0.300-preview.23116.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230214-01 + 17.6.0-preview-20230215-02 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 219/864] [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 c37b41100483f1e5cd219fc29ad730fe970e108d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:37:22 +0000 Subject: [PATCH 220/864] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15566) [release/7.0.3xx] Update dependencies from dotnet/test-templates --- 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 348a0300f..0c1b665f4 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 a53949324..eac08ee40 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 adbf0bfcbe60b3f236d76c64fc3b55cb4769ea08 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 16 Feb 2023 12:40:45 -0600 Subject: [PATCH 221/864] Remove obsolete source-build repoAPI (#15526) --- .../repo-projects/Directory.Build.props | 11 +++++ .../repo-projects/Directory.Build.targets | 48 ++----------------- .../content/repo-projects/arcade.proj | 9 ---- .../content/repo-projects/aspnetcore.proj | 10 ---- .../repo-projects/command-line-api.proj | 7 --- .../repo-projects/deployment-tools.proj | 8 ---- .../content/repo-projects/diagnostics.proj | 8 ---- .../content/repo-projects/dotnet.proj | 1 - .../content/repo-projects/emsdk.proj | 8 ---- .../content/repo-projects/format.proj | 8 ---- .../content/repo-projects/fsharp.proj | 7 --- .../content/repo-projects/installer.proj | 10 ---- .../content/repo-projects/msbuild.proj | 9 ---- .../content/repo-projects/nuget-client.proj | 4 +- .../repo-projects/package-source-build.proj | 1 - .../content/repo-projects/razor.proj | 8 ---- .../repo-projects/roslyn-analyzers.proj | 7 --- .../content/repo-projects/roslyn.proj | 3 -- .../content/repo-projects/runtime.proj | 9 ---- .../content/repo-projects/sdk.proj | 11 ----- .../repo-projects/source-build-externals.proj | 7 --- .../source-build-reference-packages.proj | 8 ---- .../content/repo-projects/sourcelink.proj | 7 --- .../content/repo-projects/symreader.proj | 8 ---- .../content/repo-projects/templating.proj | 8 ---- .../content/repo-projects/test-templates.proj | 7 --- .../content/repo-projects/vstest.proj | 2 - .../content/repo-projects/xdt.proj | 7 --- .../content/repo-projects/xliff-tasks.proj | 8 ---- 29 files changed, 16 insertions(+), 233 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 252aef141..a9546d9bc 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -29,6 +29,12 @@ $(IntermediatePath)PackageVersions.$(RepositoryName).Snapshot.props $(IntermediatePath)PackageVersions.$(RepositoryName).props AllPackages + + $(ProjectDirectory)eng/common/tools.sh + $(ProjectDirectory)eng/common/build.sh + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + $(ProjectDirectory)NuGet.Config @@ -167,4 +173,9 @@ + + + + + diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 6bc3d017d..3cbe99cc0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -17,45 +17,6 @@ - - - true - $(ProjectDirectory)/eng/common/tools.sh - $(ProjectDirectory)/eng/common/build.sh - - - - $(RepoApiImplemented) - $(RepoApiImplemented) - $(RepoApiImplemented) - - - - $(ProjectDirectory)NuGet.config - $(ProjectDirectory)NuGet.Config - $(ProjectDirectory)src\NuGet.config - $(ProjectDirectory)src\NuGet.Config - - - - - $(RepoApiArgs) /p:DotNetPackageVersionPropsPath=$(PackageVersionPropsPath) - - - - $(RepoApiArgs) /p:DotNetBuildOffline=true - - - - $(RepoApiArgs) /p:DotNetOutputBlobFeedDir=$(SourceBuiltBlobFeedDir) - - @@ -97,7 +58,6 @@ NewText="$(NewText)" /> - - + @@ -293,8 +253,8 @@ - $(BuildCommand) /v:$(LogVerbosity) $(RepoApiArgs) $(RedirectRepoOutputToLog) - $(BuildCommand) $(RepoApiArgs) $(RedirectRepoOutputToLog) + $(BuildCommand) /v:$(LogVerbosity) $(RedirectRepoOutputToLog) + $(BuildCommand) $(RedirectRepoOutputToLog) diff --git a/src/SourceBuild/content/repo-projects/arcade.proj b/src/SourceBuild/content/repo-projects/arcade.proj index ae90ac3c7..c3c7ea078 100644 --- a/src/SourceBuild/content/repo-projects/arcade.proj +++ b/src/SourceBuild/content/repo-projects/arcade.proj @@ -6,21 +6,12 @@ $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - $(ProjectDirectory)NuGet.config - - $(ProjectDirectory)global.json - - true - false - true true - diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index 2ede39318..abd2b580e 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -24,12 +24,6 @@ true - false - true - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - CS9057 @@ -18,9 +14,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj index b1a23d341..25eeb3d9e 100644 --- a/src/SourceBuild/content/repo-projects/fsharp.proj +++ b/src/SourceBuild/content/repo-projects/fsharp.proj @@ -12,9 +12,6 @@ $(BuildCommandArgs) --sourcebuild $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true @@ -25,10 +22,6 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 6713b700b..b368b83ec 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -43,20 +43,10 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - true - true - - $(ProjectDirectory)NuGet.config - CS9057 - - - - diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj index 58f840009..9dc993f2b 100644 --- a/src/SourceBuild/content/repo-projects/msbuild.proj +++ b/src/SourceBuild/content/repo-projects/msbuild.proj @@ -13,14 +13,6 @@ $(BuildCommandArgs) $(OutputVersionArgs) $(BuildCommandArgs) /p:DotNetCoreSdkDir=$(DotNetCliToolDir) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - - $(ProjectDirectory)NuGet.config - - true - false - - $(ProjectDirectory)global.json @@ -43,7 +35,6 @@ --> - $(KeysDir)NuGet.Client.snk - false - true true CS9057 @@ -12,6 +10,7 @@ + @@ -24,5 +23,4 @@ - diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index ec607bfe0..ac30ad7a2 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -2,7 +2,6 @@ - false $(SubmoduleDirectory)$(RepositoryName)/ true $(CurrentSourceBuiltPackageVersionPropsPath) diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj index a56aa1ea4..89cdd2b8d 100644 --- a/src/SourceBuild/content/repo-projects/razor.proj +++ b/src/SourceBuild/content/repo-projects/razor.proj @@ -4,10 +4,6 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - NU1507 @@ -17,9 +13,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj index 3c980eb65..c9869f517 100644 --- a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj +++ b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj @@ -6,10 +6,7 @@ $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - false true - $(ProjectDirectory)global.json DependenciesOnly @@ -22,9 +19,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj index f4e3b8095..078b23836 100644 --- a/src/SourceBuild/content/repo-projects/roslyn.proj +++ b/src/SourceBuild/content/repo-projects/roslyn.proj @@ -16,9 +16,7 @@ $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) - false true - $(ProjectDirectory)global.json @@ -30,7 +28,6 @@ - diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index e42eef565..d3058b5a5 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -27,17 +27,8 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) - - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - true - - - diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 5872f71fd..050dabf28 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -14,19 +14,8 @@ $(BuildCommandArgs) -v $(LogVerbosity) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - - $(ProjectDirectory)NuGet.config - $(ProjectDirectory)global.json - - true - false - - - - diff --git a/src/SourceBuild/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj index 07f094829..6f905da54 100644 --- a/src/SourceBuild/content/repo-projects/source-build-externals.proj +++ b/src/SourceBuild/content/repo-projects/source-build-externals.proj @@ -3,14 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - - $(ProjectDirectory)NuGet.config - false - - - - diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index c1321e716..4c535e89c 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -10,18 +10,10 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ProjectDirectory)NuGet.config - $(ProjectDirectory)global.json - false - true - - - - diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj index f034ee76c..a048b6a1f 100644 --- a/src/SourceBuild/content/repo-projects/sourcelink.proj +++ b/src/SourceBuild/content/repo-projects/sourcelink.proj @@ -4,19 +4,12 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true - false true - - - - diff --git a/src/SourceBuild/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj index 57ab7cd52..6f905da54 100644 --- a/src/SourceBuild/content/repo-projects/symreader.proj +++ b/src/SourceBuild/content/repo-projects/symreader.proj @@ -3,15 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj index ed0971d42..2f54e0da3 100644 --- a/src/SourceBuild/content/repo-projects/templating.proj +++ b/src/SourceBuild/content/repo-projects/templating.proj @@ -7,10 +7,6 @@ $(BuildCommandArgs) $(FlagParameterPrefix)v $(LogVerbosity) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false @@ -18,9 +14,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj index cbe50b8c6..61b87a209 100644 --- a/src/SourceBuild/content/repo-projects/test-templates.proj +++ b/src/SourceBuild/content/repo-projects/test-templates.proj @@ -6,10 +6,7 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true - false @@ -17,9 +14,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj index 67eac4ddd..c0ce08237 100644 --- a/src/SourceBuild/content/repo-projects/vstest.proj +++ b/src/SourceBuild/content/repo-projects/vstest.proj @@ -6,9 +6,7 @@ $(BuildCommandArgs) /p:SemanticVersioningV1=true $(ProjectDirectory)\eng\common\build$(ShellExtension) $(BuildCommandArgs) - false true - $(ProjectDirectory)global.json diff --git a/src/SourceBuild/content/repo-projects/xdt.proj b/src/SourceBuild/content/repo-projects/xdt.proj index 31f889ad1..43d3336f2 100644 --- a/src/SourceBuild/content/repo-projects/xdt.proj +++ b/src/SourceBuild/content/repo-projects/xdt.proj @@ -6,19 +6,12 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true - false - - - - diff --git a/src/SourceBuild/content/repo-projects/xliff-tasks.proj b/src/SourceBuild/content/repo-projects/xliff-tasks.proj index a5881adb4..e6c43dd75 100644 --- a/src/SourceBuild/content/repo-projects/xliff-tasks.proj +++ b/src/SourceBuild/content/repo-projects/xliff-tasks.proj @@ -5,18 +5,10 @@ $(StandardSourceBuildArgs) $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - true true true - - $(ProjectDirectory)NuGet.config - - - - From 54f4dc22c20919b32bcfee7e222196f856fb96e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Feb 2023 20:03:53 +0000 Subject: [PATCH 222/864] Update dependencies from https://github.com/dotnet/sdk build 20230216.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23116.2 -> To Version 8.0.100-preview.2.23116.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23115.9 -> To Version 8.0.0-preview.2.23116.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8df827791..b368aa7e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 281bba092aec24d1b61d1cde7481d0b25c6b6e88 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6ac256fd2d59b0f68655c50d65e8a1a2392a510a + d15ca69e9850c3504d06e5bbc8aace5885d0b45b - + https://github.com/dotnet/sdk - 6ac256fd2d59b0f68655c50d65e8a1a2392a510a + d15ca69e9850c3504d06e5bbc8aace5885d0b45b - + https://github.com/dotnet/sdk - 6ac256fd2d59b0f68655c50d65e8a1a2392a510a + d15ca69e9850c3504d06e5bbc8aace5885d0b45b - + https://github.com/dotnet/sdk - 6ac256fd2d59b0f68655c50d65e8a1a2392a510a + d15ca69e9850c3504d06e5bbc8aace5885d0b45b @@ -142,9 +142,9 @@ 9da4e7f7505af42b34e1a2d7ba6857f98782025f - + https://github.com/dotnet/runtime - 6dfc7d35c927d55b61b01b7c5131b8ea690be707 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 https://github.com/dotnet/roslyn @@ -156,9 +156,9 @@ dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 - + https://github.com/nuget/nuget.client - 55728432057dc57733661fe01e9c8493ab5034f2 + 00375a7dfc2e2687c95ada0a0d24b570dc807d5d diff --git a/eng/Versions.props b/eng/Versions.props index 88135d1bb..ecbadd19e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23116.2 - 8.0.100-preview.2.23116.2 - 8.0.100-preview.2.23116.2 + 8.0.100-preview.2.23116.12 + 8.0.100-preview.2.23116.12 + 8.0.100-preview.2.23116.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23115.9 - 8.0.0-preview.2.23115.9 - 8.0.0-preview.2.23115.9 - 8.0.0-preview.2.23115.9 - 8.0.0-preview.2.23115.9 - 8.0.0-preview.2.23115.9 + 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23116.1 2.1.0 From 715cc2ae1d62ef1bf84ab3fd4e5637e6e91f1390 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 14:19:48 -0800 Subject: [PATCH 223/864] [main] Update dependencies from dotnet/arcade (#15444) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell Co-authored-by: Premek Vysoky --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8df827791..2754a52e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - c453dfef2f41533de5cb03b2115aab9d0dfc74c6 + 02980a654d20995c38eca6ceabf729c4c13412c4 - + https://github.com/dotnet/arcade - c453dfef2f41533de5cb03b2115aab9d0dfc74c6 + 02980a654d20995c38eca6ceabf729c4c13412c4 - + https://github.com/dotnet/arcade - c453dfef2f41533de5cb03b2115aab9d0dfc74c6 + 02980a654d20995c38eca6ceabf729c4c13412c4 https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ d8427722f537c3fbdc753dce52af1f104a8048d6 - + https://github.com/dotnet/sourcelink - 4ad5e57a1489a065674bd4da72b788f073dab638 + 763c618bbc4cc6481d37d122dc0dd3c2cafbcd49 - + https://github.com/dotnet/xliff-tasks - ff7db52c8a66e892216be667271e726a02661cad + 3cb4fa02ba389a7f070a16c50227cba2e610b48d diff --git a/eng/Versions.props b/eng/Versions.props index 88135d1bb..0bfca2eec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23103.1 + 8.0.0-beta.23106.4 diff --git a/global.json b/global.json index 7a377f7ca..669d24dbf 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23103.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23103.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23106.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23106.4" } } From c32738ee77d31338329c4eca349e2de8af0aeea1 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 16 Feb 2023 17:26:44 -0600 Subject: [PATCH 224/864] .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 6bd39417c02dd4cfa3b12e2d92c20be32f7c9faa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Feb 2023 23:45:26 +0000 Subject: [PATCH 225/864] Update dependencies from https://github.com/dotnet/sdk build 20230216.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23116.3 -> To Version 7.0.300-preview.23116.20 --- NuGet.config | 6 ------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f14f7ff0..cca4643c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -46,9 +43,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c1b665f4..98cda2204 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 diff --git a/eng/Versions.props b/eng/Versions.props index eac08ee40..886e7eff5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23116.3 - 7.0.300-preview.23116.3 - 7.0.300-preview.23116.3 + 7.0.300-preview.23116.20 + 7.0.300-preview.23116.20 + 7.0.300-preview.23116.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b56c888b33f3f0c931424a41bf69bb6776302f0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 03:33:46 +0000 Subject: [PATCH 226/864] Update dependencies from https://github.com/dotnet/sdk build 20230216.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23116.12 -> To Version 8.0.100-preview.2.23116.28 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.2.23115.12 -> To Version 8.0.0-preview.2.23116.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 779e72f2e..84193c212 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f - + https://github.com/dotnet/aspnetcore - 6a7bcda42de7b98196b38924cc354216eba57c9b + e0f2d098d55e4acbb0990eb452e409a8646b4d0f https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d15ca69e9850c3504d06e5bbc8aace5885d0b45b + 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 - + https://github.com/dotnet/sdk - d15ca69e9850c3504d06e5bbc8aace5885d0b45b + 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 - + https://github.com/dotnet/sdk - d15ca69e9850c3504d06e5bbc8aace5885d0b45b + 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 - + https://github.com/dotnet/sdk - d15ca69e9850c3504d06e5bbc8aace5885d0b45b + 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 diff --git a/eng/Versions.props b/eng/Versions.props index a0c700e78..b27dffe65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23115.12 - 8.0.0-preview.2.23115.12 - 8.0.0-preview.2.23115.12 - 8.0.0-preview.2.23115.12 - 8.0.0-preview.2.23115.12 - 8.0.0-preview.2.23115.12 - 8.0.0-preview.2.23115.12 + 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.7 0.2.0 - 8.0.100-preview.2.23116.12 - 8.0.100-preview.2.23116.12 - 8.0.100-preview.2.23116.12 + 8.0.100-preview.2.23116.28 + 8.0.100-preview.2.23116.28 + 8.0.100-preview.2.23116.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccb3d41d0c4e35d942ad74bea8e68a9b05da1e54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:57:05 +0000 Subject: [PATCH 227/864] [main] Update dependencies from dotnet/sdk (#15579) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.2.23115.1 to 8.0.0-preview.2.23116.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.2.23115.1 to 8.0.0-preview.2.23116.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.2.23115.1 to 8.0.0-preview.2.23116.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.2.23116.7 to 8.0.0-preview.2.23116.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.2.23115.1 to 8.0.0-preview.2.23116.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.2.23114.8 to 8.0.0-preview.2.23115.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.2.23115.1 to 8.0.0-preview.2.23116.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.2.23114.3 to 8.0.0-preview.2.23116.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84193c212..456bd9da8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 281bba092aec24d1b61d1cde7481d0b25c6b6e88 + 66490f36fdc0a5c7b6ef23614b7cc848761c55ef - + https://github.com/dotnet/windowsdesktop - 281bba092aec24d1b61d1cde7481d0b25c6b6e88 + 66490f36fdc0a5c7b6ef23614b7cc848761c55ef - + https://github.com/dotnet/windowsdesktop - 281bba092aec24d1b61d1cde7481d0b25c6b6e88 + 66490f36fdc0a5c7b6ef23614b7cc848761c55ef - + https://github.com/dotnet/windowsdesktop - 281bba092aec24d1b61d1cde7481d0b25c6b6e88 + 66490f36fdc0a5c7b6ef23614b7cc848761c55ef https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 - + https://github.com/dotnet/aspnetcore - e0f2d098d55e4acbb0990eb452e409a8646b4d0f + bb3f0d626627d399695a9fa0741e4803c0c23eb8 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 + 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 - + https://github.com/dotnet/sdk - 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 + 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 - + https://github.com/dotnet/sdk - 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 + 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 - + https://github.com/dotnet/sdk - 9606bb0ab338367f8a83c3f9ce288e0ce08aefb4 + 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 - + https://github.com/dotnet/winforms - 5f7876498859aaa16343ce546c0004ef778de830 + c90f5134458cfdfd67cdae0a3fcaf1a3b7f14cf0 - + https://github.com/dotnet/wpf - 01559f6a23310e1361adbc8916909088b7a45ce0 + b148c5c887e11f5bc1e40c01fa319ab24852e4b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b27dffe65..c8ba163cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23114.8 + 8.0.0-preview.2.23115.5 - 8.0.0-preview.2.23114.3 + 8.0.0-preview.2.23116.2 @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23116.7 - 8.0.0-preview.2.23116.7 - 8.0.0-preview.2.23116.7 - 8.0.0-preview.2.23116.7 - 8.0.0-preview.2.23116.7 - 8.0.0-preview.2.23116.7 - 8.0.0-preview.2.23116.7 + 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23116.9 0.2.0 - 8.0.100-preview.2.23116.28 - 8.0.100-preview.2.23116.28 - 8.0.100-preview.2.23116.28 + 8.0.100-preview.2.23117.1 + 8.0.100-preview.2.23117.1 + 8.0.100-preview.2.23117.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.2.23115.1 - 8.0.0-preview.2.23115.1 - 8.0.0-preview.2.23115.1 - 8.0.0-preview.2.23115.1 + 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23116.2 From a453014cddf8d43a1ea0f8fa22187cf65c50a479 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 13:27:13 +0000 Subject: [PATCH 228/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.1 -> To Version 8.0.100-preview.2.23117.2 --- 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 456bd9da8..4333ae582 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 + 83f7a7ac666f767541091ee1f82771818a9c0b84 - + https://github.com/dotnet/sdk - 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 + 83f7a7ac666f767541091ee1f82771818a9c0b84 - + https://github.com/dotnet/sdk - 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 + 83f7a7ac666f767541091ee1f82771818a9c0b84 - + https://github.com/dotnet/sdk - 53fcc31d5ca2cc2cc57190eb06aa60e94d47d571 + 83f7a7ac666f767541091ee1f82771818a9c0b84 diff --git a/eng/Versions.props b/eng/Versions.props index c8ba163cb..5821f3afa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23117.1 - 8.0.100-preview.2.23117.1 - 8.0.100-preview.2.23117.1 + 8.0.100-preview.2.23117.2 + 8.0.100-preview.2.23117.2 + 8.0.100-preview.2.23117.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 563606ff1edae8d5854fb8c0f956f0e26aa430c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 16:19:04 +0000 Subject: [PATCH 229/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.1 -> To Version 8.0.100-preview.2.23117.3 --- 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 4333ae582..ec8d110ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 83f7a7ac666f767541091ee1f82771818a9c0b84 + 9f43a4a55078a22daac527c99e98d26e827a0ee2 - + https://github.com/dotnet/sdk - 83f7a7ac666f767541091ee1f82771818a9c0b84 + 9f43a4a55078a22daac527c99e98d26e827a0ee2 - + https://github.com/dotnet/sdk - 83f7a7ac666f767541091ee1f82771818a9c0b84 + 9f43a4a55078a22daac527c99e98d26e827a0ee2 - + https://github.com/dotnet/sdk - 83f7a7ac666f767541091ee1f82771818a9c0b84 + 9f43a4a55078a22daac527c99e98d26e827a0ee2 diff --git a/eng/Versions.props b/eng/Versions.props index 5821f3afa..4ebd5a929 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23117.2 - 8.0.100-preview.2.23117.2 - 8.0.100-preview.2.23117.2 + 8.0.100-preview.2.23117.3 + 8.0.100-preview.2.23117.3 + 8.0.100-preview.2.23117.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 914b24dcdd406ac8ba7d78d4594b433697034325 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 17 Feb 2023 10:28:43 -0600 Subject: [PATCH 230/864] .NET Source-Build 6.0.114 February 2023 Updates (#15560) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MsftToSbSdk.diff | 35 ------------------- .../assets/baselines/PoisonUsage.txt | 12 +++++++ 4 files changed, 14 insertions(+), 37 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 303422517..78a54dd2c 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.113 + 6.0.114.1 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index daee7866a..1ddd98bf4 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.113" + "dotnet": "6.0.114" }, "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 4c334fee4..c2ff554cc 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 @@ -14,21 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -43,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -1453,21 +1435,4 @@ index ------------ -./sdk/x.y.z/zh-Hant/vstest.console.resources.dll ./shared/ ./shared/Microsoft.AspNetCore.App/ - ./shared/Microsoft.AspNetCore.App/x.y.z/ @@ ------------ @@ - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Extensions.WebEncoders.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.JSInterop.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Net.Http.Headers.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.DiagnosticSource.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.EventLog.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Formats.Asn1.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.IO.Pipelines.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Runtime.CompilerServices.Unsafe.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.AccessControl.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Pkcs.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Xml.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Encodings.Web.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Json.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/THIRD-PARTY-NOTICES.txt - ./shared/Microsoft.NETCore.App/ - ./shared/Microsoft.NETCore.App/x.y.z/ \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 25f79024b..56f3b8d1c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1079,6 +1079,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -1133,6 +1139,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute From a18c9247f497376a0cf863a47eb3653ad34412c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 17 Feb 2023 17:39:17 +0100 Subject: [PATCH 231/864] Support sync of a single repository into the VMR (#15569) --- .config/dotnet-tools.json | 2 +- .devcontainer/vmr-source-build/README.md | 36 ++++- .devcontainer/vmr-source-build/init.sh | 6 +- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- .../templates/steps/vmr-pull-updates.yml | 3 +- eng/vmr-sync.sh | 150 ++++++++++-------- 7 files changed, 134 insertions(+), 73 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 94f634bc5..adcab856d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23107.1", + "version": "1.1.0-beta.23116.2", "commands": [ "darc" ] diff --git a/.devcontainer/vmr-source-build/README.md b/.devcontainer/vmr-source-build/README.md index b3a5b337a..64cbd3dab 100644 --- a/.devcontainer/vmr-source-build/README.md +++ b/.devcontainer/vmr-source-build/README.md @@ -14,6 +14,8 @@ This Codespace can help you debug the source build of .NET. In case you have run the VMR which is what the VMR leg in the installer PR build doing. This build takes about 45 minutes and, after completion, produces an archived .NET SDK in `/workspaces/artifacts/x64/Release`. +## Build the SDK + To build the VMR, run following: ```bash cd /workspaces/dotnet @@ -22,6 +24,38 @@ unset RepositoryName ``` > Please note that, at this time, the build modifies some of the checked-in sources so it might -be preferential to rebuild the Codespace between attempts. +be preferential to rebuild the Codespace between attempts (or reset the working tree changes). For more details, see the instructions at https://github.com/dotnet/dotnet. + +## Synchronize your changes in locally + +When debugging the build, you have two options how to test your changes in this environment. + +### Making changes to the VMR directly + +You can make the changes directly to the local checkout of the VMR at `/workspaces/dotnet`. You +can then try to build the VMR and see if the change works for you. + +### Pull changes into the local VMR + +You can also make a fix in the individual source repository (e.g. `dotnet/runtime`) and push the +fix into a branch (can be in your fork too). Once you have the commit pushed, you can pull this +version of the repository into the VMR locally. + +Let's consider you pushed a commit with SHA `abcdef` into your fork at `github.com/yourfork/runtime`. +You can now bring this version of runtime into the local VMR in this Codespace by running: + +```bash +cd /workspaces/installer +./eng/vmr-sync.sh \ + --vmr /workspaces/dotnet \ + --tmp /workspaces/tmp \ + --repository runtime:abcdef \ + --remote runtime:https://github.com/yourfork/runtime +``` + +You can now proceed building the VMR in the Codespace using instructions above. You can repeat +this process and sync a new commit from your fork. Only note that, at this time, Source-Build +modifies some of the checked-in sources so you'll need to revert the working tree changes +between attempts. diff --git a/.devcontainer/vmr-source-build/init.sh b/.devcontainer/vmr-source-build/init.sh index d08c2751c..d50035a8f 100755 --- a/.devcontainer/vmr-source-build/init.sh +++ b/.devcontainer/vmr-source-build/init.sh @@ -17,7 +17,11 @@ git -C "$installer_dir" fetch --all --unshallow # We will try to figure out, which branch is the current (PR) branch based off of # We need this to figure out, which VMR branch to use -vmr_branch=$(git log --pretty=format:'%D' HEAD^ | grep 'origin/' | head -n1 | sed 's@origin/@@' | sed 's@,.*@@') +vmr_branch=$(git -C "$installer_dir" log --pretty=format:'%D' HEAD^ \ + | grep 'origin/' \ + | head -n1 \ + | sed 's@origin/@@' \ + | sed 's@,.*@@') pushd "$installer_dir" "./eng/vmr-sync.sh" \ diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 456bd9da8..9809b1200 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,13 +208,13 @@ https://github.com/dotnet/arcade 02980a654d20995c38eca6ceabf729c4c13412c4 - + https://github.com/dotnet/arcade-services - c6f3ec3b751020f757695bcd351b1cbb179e21bd + babaa0d787b3921bae3e97d053f6b73c74e750b0 - + https://github.com/dotnet/arcade-services - c6f3ec3b751020f757695bcd351b1cbb179e21bd + babaa0d787b3921bae3e97d053f6b73c74e750b0 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c8ba163cb..fc33d6ce4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.23107.1 + 1.1.0-beta.23116.2 diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 57814b994..91244445b 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -33,7 +33,8 @@ steps: --vmr ${{ parameters.vmrPath }} --tmp $(Agent.TempDirectory) --branch ${{ parameters.vmrBranch }} - --target-ref ${{ parameters.targetRef }} + --repository "installer:${{ parameters.targetRef }}" + --recursive --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --debug diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index e5656fc0e..c13041716 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -1,63 +1,58 @@ #!/bin/bash -### This script is used for synchronizing the dotnet/dotnet repository locally -### It is used during CI to ingest new code based on dotnet/installer -### I can also help for reproducing potential failures during installer's PRs, -### namely during errors during the 'Synchronize dotnet/dotnet' build step from -### the 'VMR Source-Build'. -### The following scenario is assumed: -### - There is a PR in dotnet/installer -### - The PR is failing on the 'VMR Source-Build' job in the 'Synchronize dotnet/dotnet' step +### This script is used for synchronizing the dotnet/dotnet VMR locally. This means pulling new +### code from various repositories into the 'dotnet/dotnet' repository. ### -### There are a few possible reasons but usually this happens because there is a mismatch between -### source patches that are applied on top of the files that are being synchronized from repositories -### into the 'dotnet/dotnet' repo and new changes in the repositories. -### This manifests as the following error: -### fail: Failed to synchronize repo installer -### Failed to apply the patch for src/aspnetcore -### Exit code: 1 -### Std err: -### error: patch failed: src/aspnetcore/eng/SourceBuild.props:55 -### error: src/aspnetcore/eng/SourceBuild.props: patch does not apply +### The script is used during CI to ingest new code based on dotnet/installer but it can also help +### for reproducing potential failures during installer's PRs, namely to fix the Source-Build. +### Another usecase is to try manually synchronizing a given commit of some repo into the VMR and +### trying to Source-Build the VMR. This can help when fixing the Source-Build but using a commit +### from a not-yet merged branch (or fork) to test the fix will help. ### -### where 'src/aspnetcore/eng/SourceBuild.props' would be the file that is being patched and new -### changes to it are conflicting with the patch that is being applied. -### -### The whole process can be reproduced locally easily by running this script. -### The patches are located in a folder in the 'dotnet/installer' repository. -### At the moment of writing, the location is 'src/SourceBuild/patches' but to get -### the up-to-date location, please see the 'patchesPath' property in -### https://github.com/dotnet/dotnet/blob/main/src/source-mappings.json -### -### You will need to compare what is in the patch and what is in the file and fix the patch. -### -### The tooling that synchronizes the VMR will need to clone the various repositories. -### It clones them into a temporary folder and re-uses them on future runs so it is advised -### you dedicate a folder to this to speed up your re-runs. -### -### This script will synchronize the 'dotnet/dotnet' repo locally and let you inspect the changes. +### The tooling that synchronizes the VMR will need to clone the various repositories into a temporary +### folder. These clones can be re-used in future synchronizations so it is advised you dedicate a +### folder to this to speed up your re-runs. ### ### USAGE: +### Synchronize the VMR to the commit of dotnet/installer that is currently being built: ### ./vmr-sync.sh --tmp-dir "$HOME/repos/tmp" +### +### Synchronize the VMR to a specific commit of dotnet/runtime using custom fork: +### ./vmr-sync.sh \ +### --repository runtime:e7e71da303af8dc97df99b098f21f526398c3943 \ +### --remote runtime:https://github.com/yourfork/runtime \ +### --tmp-dir "$HOME/repos/tmp"\ +### ### Options: ### -t, --tmp, --tmp-dir PATH ### Required. Path to the temporary folder where repositories will be cloned +### --repository name:GIT_REF +### Optional. Repository + git ref separated by colon to synchronize to. +### This can be a specific commit, branch, tag.. +### When omitted, the script will synchronize the installer commit based on the version of the parent +### where this script is stored. ### -v, --vmr, --vmr-dir PATH ### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder ### -b, --branch, --vmr-branch BRANCH_NAME ### Optional. Branch of the 'dotnet/dotnet' repo to synchronize to -### This should match the target branch of the PR, defaults to 'main' -### --target-ref GIT_REF -### Optional. Git ref to synchronize to. This can be a specific commit, branch, tag.. -### Defaults to the revision of the parent installer repo -### --debug -### Optional. Turns on the most verbose logging for the VMR tooling +### This should match the target branch of the PR; defaults to 'main' +### --remote name:URI +### Optional. Additional remote to use during the synchronization +### This can be used to synchronize to a commit from a fork of the repository +### Example: 'runtime:https://github.com/yourfork/runtime' +### --recursive +### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) +### This is used when performing the full synchronization during installer's CI and the final VMR sync. +### Defaults to false unless no repository is supplied in which case a recursive sync of installer is performed. ### --readme-template -### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of components. +### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of +### components. ### Defaults to src/VirtualMonoRepo/README.template.md ### --tpn-template ### Optional. Template for the header of VMRs THIRD-PARTY-NOTICES file. ### Defaults to src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt +### --debug +### Optional. Turns on the most verbose logging for the VMR tooling source="${BASH_SOURCE[0]}" @@ -93,10 +88,12 @@ installer_dir=$(realpath "$scriptroot/../") tmp_dir='' vmr_dir='' vmr_branch='main' -target_ref='' +repository='' +recursive=false verbosity=verbose -tpn_template='' -readme_template='' +additional_remotes="installer:$installer_dir" +readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" +tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" @@ -113,11 +110,15 @@ while [[ $# -gt 0 ]]; do vmr_branch=$2 shift ;; - -d|--debug) - verbosity=debug + --repository) + repository=$2 + shift ;; - --target-ref) - target_ref=$2 + --recursive) + recursive=true + ;; + --remote) + additional_remotes="$additional_remotes,$2" shift ;; --readme-template) @@ -128,6 +129,9 @@ while [[ $# -gt 0 ]]; do tpn_template=$2 shift ;; + -d|--debug) + verbosity=debug + ;; -h|--help) print_help exit 0 @@ -142,19 +146,13 @@ while [[ $# -gt 0 ]]; do shift done +# Validation + if [[ ! -d "$installer_dir" ]]; then fail "Directory '$installer_dir' does not exist. Please specify the path to the dotnet/installer repo" exit 1 fi -if [[ -z "$readme_template" ]]; then - readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" -fi - -if [[ -z "$tpn_template" ]]; then - tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" -fi - if [[ -z "$tmp_dir" ]]; then fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned" exit 1 @@ -170,6 +168,15 @@ if [[ ! -f "$tpn_template" ]]; then exit 1 fi +# Sanitize the input + +if [[ -z "$repository" ]]; then + current_sha=$(git -C "$installer_dir" rev-parse HEAD) + echo "No repository specified, will synchronize installer:$current_sha" + repository="installer:$current_sha" + recursive=true +fi + if [[ -z "$vmr_dir" ]]; then vmr_dir="$tmp_dir/dotnet" fi @@ -182,6 +189,8 @@ if [[ "$verbosity" == "debug" ]]; then set -x fi +# Prepare the VMR + if [[ ! -d "$vmr_dir" ]]; then highlight "Cloning 'dotnet/dotnet' into $vmr_dir.." git clone https://github.com/dotnet/dotnet "$vmr_dir" @@ -200,24 +209,37 @@ fi set -e # Prepare darc + highlight 'Installing .NET, preparing the tooling..' source "$scriptroot/common/tools.sh" InitializeDotNetCli true dotnet="$scriptroot/../.dotnet/dotnet" "$dotnet" tool restore -# Run the sync -if [[ -z "$target_ref" ]]; then - target_ref=$(git -C "$installer_dir" rev-parse HEAD) -fi - -highlight "Starting the synchronization to '$target_ref'.." +highlight "Starting the synchronization to '$repository'.." set +e -if "$dotnet" darc vmr update --vmr "$vmr_dir" --tmp "$tmp_dir" --$verbosity --recursive --readme-template "$readme_template" --tpn-template "$tpn_template" --additional-remotes "installer:$installer_dir" "installer:$target_ref"; then +recursive_arg='' +if [[ "$recursive" == "true" ]]; then + recursive_arg="--recursive" +fi + +# Synchronize the VMR + +"$dotnet" darc vmr update \ + --vmr "$vmr_dir" \ + --tmp "$tmp_dir" \ + --$verbosity \ + $recursive_arg \ + --readme-template "$readme_template" \ + --tpn-template "$tpn_template" \ + --additional-remotes "$additional_remotes" \ + "$repository" + +if [[ $? == 0 ]]; then highlight "Synchronization succeeded" else - fail "Synchronization of dotnet/dotnet to '$target_ref' failed!" + fail "Synchronization of dotnet/dotnet to '$repository' failed!" fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)." fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)." fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." From 64fa38ea4d2c901926d70ac023538c0c54d7cf78 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 17 Feb 2023 17:04:23 +0000 Subject: [PATCH 232/864] Update dependencies from source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9809b1200..bbfd4ba16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d8427722f537c3fbdc753dce52af1f104a8048d6 + e0402855655756b9562138b327763e1c97d0b908 From ee8c1a42c43e46497c59aa6b83e3d5454df62de0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 17:47:23 +0000 Subject: [PATCH 233/864] Merged PR 29685: [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**: 20230216.18 - **Date Produced**: February 16, 2023 10:38:18 PM UTC - **Commit**: a44ab75d514605822a8b889033df94c1866dea03 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.115-servicing.23115.29 to 6.0.115-servicing.23116.18][1] - **Microsoft.NET.Sdk**: [from 6.0.115-servicing.23115.29 to 6.0.115-servicing.23116.18][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd59c808&targetVersion=GCa44ab75&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- 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 30b55f361..5bbc60497 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 46ea183f02224e86675f0936217d1a554f3c506c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d59c8088920f1956fd606cab7f40af52b747abdf + a44ab75d514605822a8b889033df94c1866dea03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d59c8088920f1956fd606cab7f40af52b747abdf + a44ab75d514605822a8b889033df94c1866dea03 diff --git a/eng/Versions.props b/eng/Versions.props index 8e527ee26..78b6082f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23115.29 - 6.0.115-servicing.23115.29 + 6.0.115-servicing.23116.18 + 6.0.115-servicing.23116.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49d72191dbb4054dfd4415d51befa07377108812 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 17:49:56 +0000 Subject: [PATCH 234/864] Merged PR 29634: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20230214.5 - **Date Produced**: February 15, 2023 4:28:13 AM UTC - **Commit**: 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23060.6 to 6.0.0-beta.23114.5][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23060.6 to 6.0.0-beta.23114.5][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23060.6 to 6.0.0-beta.23114.5][1] [1]: https://github.com/dotnet/arcade/compare/74b7648...0c93c1c [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.114 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- 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 d32bdf112..6be40a3b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,17 @@ + + + + + @@ -41,14 +48,21 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e92ec822e..0c4a9627c 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 892fd05f5..739c9f826 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 8afd714a8f7ad4235dcfcc410943bfbd57327135 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 17:52:16 +0000 Subject: [PATCH 235/864] Merged PR 29669: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Build**: from 17.4.1 to 17.4.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230216.10 - **Date Produced**: February 16, 2023 7:37:51 PM UTC - **Commit**: 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23115.28 to 7.0.104-servicing.23116.10][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23115.28 to 7.0.104-servicing.23116.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23115.28 to 7.0.104-servicing.23116.10][1] - **Microsoft.Build**: [from 17.4.1 to 17.4.1][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9032926&targetVersion=GC92f3c6d&_a=files [2]: https://github.com/dotnet/msbuild/compare/fedecea...2eac915 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 700590676..62c134465 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6855697d2..078b21bf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 + 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 + 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 + 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9032926ac0bcc3f94e957fef8eb32fefcfc1aee6 + 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 @@ -151,7 +151,7 @@ https://github.com/dotnet/msbuild - fedecea9d0d923d3520309dcf69e1dd4a485ef75 + 2eac9157adc012e2956c7c5f33c15aeb0cfe7d6a diff --git a/eng/Versions.props b/eng/Versions.props index 93f30d7f7..9125a7963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,9 +64,8 @@ 7.0.104 - 7.0.104-servicing.23115.28 - 7.0.104-servicing.23115.28 - + 7.0.104-servicing.23116.10 + 7.0.104-servicing.23116.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bbeab10e482b7c30979c9dcbefd73f65c07aeae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 20:29:29 +0000 Subject: [PATCH 236/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23116.20 -> To Version 7.0.300-preview.23117.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230215-02 -> To Version 17.6.0-preview-20230216-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index cca4643c7..60f566b46 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,6 @@ - - @@ -45,8 +43,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98cda2204..f9d0dc7b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 9da4e7f7505af42b34e1a2d7ba6857f98782025f + ffe76699011531871532725b317bfcac1d45ef5f @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 + c5cceaabe1b83f8aaea2f29792157b6307b29686 diff --git a/eng/Versions.props b/eng/Versions.props index 886e7eff5..f2e8d3ce3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23116.20 - 7.0.300-preview.23116.20 - 7.0.300-preview.23116.20 + 7.0.300-preview.23117.12 + 7.0.300-preview.23117.12 + 7.0.300-preview.23117.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230215-02 + 17.6.0-preview-20230216-01 From a75d7cdf9dbda5fcf9c8b56284c471306b310ebf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 20:37:12 +0000 Subject: [PATCH 237/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23117.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23116.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e13e7a01a..46a3a0973 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 873553aa95454411b2e2b549f544178bf8689044 - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 873553aa95454411b2e2b549f544178bf8689044 - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 873553aa95454411b2e2b549f544178bf8689044 - + https://github.com/dotnet/windowsdesktop - 66490f36fdc0a5c7b6ef23614b7cc848761c55ef + 873553aa95454411b2e2b549f544178bf8689044 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 - + https://github.com/dotnet/aspnetcore - bb3f0d626627d399695a9fa0741e4803c0c23eb8 + ee999df00d443356e3b97031c5bfe198909a2076 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 00c201acd874607ed056f9880038c43d23f27a33 - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 00c201acd874607ed056f9880038c43d23f27a33 - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 00c201acd874607ed056f9880038c43d23f27a33 - + https://github.com/dotnet/sdk - 9f43a4a55078a22daac527c99e98d26e827a0ee2 + 00c201acd874607ed056f9880038c43d23f27a33 https://github.com/dotnet/winforms c90f5134458cfdfd67cdae0a3fcaf1a3b7f14cf0 - + https://github.com/dotnet/wpf - b148c5c887e11f5bc1e40c01fa319ab24852e4b1 + a26c10aabc0a5e068c4e1b3aecdb39dfeb52c966 https://github.com/dotnet/fsharp @@ -137,14 +137,14 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 9da4e7f7505af42b34e1a2d7ba6857f98782025f + ffe76699011531871532725b317bfcac1d45ef5f - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 805d7d660..88cf82b8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23116.3 @@ -58,46 +58,46 @@ - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 - 8.0.0-preview.2.23116.9 + 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23117.1 0.2.0 - 8.0.100-preview.2.23117.3 - 8.0.100-preview.2.23117.3 - 8.0.100-preview.2.23117.3 + 8.0.100-preview.2.23117.11 + 8.0.100-preview.2.23117.11 + 8.0.100-preview.2.23117.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23117.2 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.2 2.1.0 - 8.0.0-preview.2.23116.2 - 8.0.0-preview.2.23116.2 - 8.0.0-preview.2.23116.2 - 8.0.0-preview.2.23116.2 + 8.0.0-preview.2.23116.3 + 8.0.0-preview.2.23116.3 + 8.0.0-preview.2.23116.3 + 8.0.0-preview.2.23116.3 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230215-02 + 17.6.0-preview-20230216-01 8.0.0-alpha.1.22557.12 From 1b96f83ae6907df8a1dc5254c4158f532287990d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 21:22:18 +0000 Subject: [PATCH 238/864] Merged PR 29714: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23115.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23115.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230217.4 - **Date Produced**: February 17, 2023 6:27:06 PM UTC - **Commit**: 62fcdba42952b2e66c959c1dd513de609c40d84b - **Branch**: refs/heads/internal/release/6.... --- NuGet.config | 22 ++++-------- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++----------- 3 files changed, 63 insertions(+), 73 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82043164c..bfd18eeea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,14 @@ - - - + - - + @@ -25,9 +22,7 @@ - - - + @@ -48,13 +43,10 @@ - - - + - - + @@ -62,9 +54,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58fd16726..0e4a1bf4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04133de59be3070803d025a9dd52c07ef0087551 + 62fcdba42952b2e66c959c1dd513de609c40d84b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04133de59be3070803d025a9dd52c07ef0087551 + 62fcdba42952b2e66c959c1dd513de609c40d84b diff --git a/eng/Versions.props b/eng/Versions.props index b9376b1f5..8450953cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,44 +44,44 @@ - 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 + 6.0.15 + 6.0.15 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.406-servicing.23074.29 - 6.0.406-servicing.23074.29 + 6.0.407-servicing.23117.4 + 6.0.407-servicing.23117.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.7 + 6.0.8 - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 + 6.0.15 + 6.0.15 + 6.0.15 + 6.0.15 2.1.0 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23115.10 + 6.0.15-servicing.23115.10 + 6.0.15 + 6.0.15 From b074888efc4d46d5ccf2fbc4ddba9117a9e48461 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 21:23:21 +0000 Subject: [PATCH 239/864] Merged PR 29718: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230217.5 - **Date Produced**: February 17, 2023 6:41:52 PM UTC - **Commit**: 378d9d9a2ffa93defb6326895edf0415d1ba0346 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23116.10 to 7.0.104-servicing.23117.5][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23116.10 to 7.0.104-servicing.23117.5][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23116.10 to 7.0.104-servicing.23117.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.4 to 7.0.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2] - **dotnet-dev-certs**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2] - **dotnet-user-jwts**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2] - **dotnet-user-secrets**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC92f3c6d&targetVersion=GC378d9d9&_a=files [2]: https://dev.azure.com/dnceng/in... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 62c134465..bd5b599f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 078b21bf2..0c9a1efef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cbb5992f76fadb3fcd8d90897f3f644bd162e365 + 90d5b7ef35b89c5051c45b3326c75000d6842666 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 + 378d9d9a2ffa93defb6326895edf0415d1ba0346 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 + 378d9d9a2ffa93defb6326895edf0415d1ba0346 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 + 378d9d9a2ffa93defb6326895edf0415d1ba0346 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8 + 378d9d9a2ffa93defb6326895edf0415d1ba0346 diff --git a/eng/Versions.props b/eng/Versions.props index 9125a7963..6f7e01a66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.4 7.0.4 - 7.0.4-servicing.23113.13 - 7.0.4-servicing.23113.13 - 7.0.4-servicing.23113.13 - 7.0.4-servicing.23113.13 - 7.0.4-servicing.23113.13 + 7.0.4-servicing.23116.4 + 7.0.4-servicing.23116.4 + 7.0.4-servicing.23116.4 + 7.0.4-servicing.23116.4 + 7.0.4-servicing.23116.4 0.2.0 @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23116.10 - 7.0.104-servicing.23116.10 + 7.0.104-servicing.23117.5 + 7.0.104-servicing.23117.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1907281ff24fef2a9d0e35b727a40539acf73a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 21:49:04 +0000 Subject: [PATCH 240/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23117.17 --- 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 46a3a0973..96a8c8abc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 00c201acd874607ed056f9880038c43d23f27a33 + 765c72d71c7cd5d73340b4b150d8c7d582a2a90b - + https://github.com/dotnet/sdk - 00c201acd874607ed056f9880038c43d23f27a33 + 765c72d71c7cd5d73340b4b150d8c7d582a2a90b - + https://github.com/dotnet/sdk - 00c201acd874607ed056f9880038c43d23f27a33 + 765c72d71c7cd5d73340b4b150d8c7d582a2a90b - + https://github.com/dotnet/sdk - 00c201acd874607ed056f9880038c43d23f27a33 + 765c72d71c7cd5d73340b4b150d8c7d582a2a90b diff --git a/eng/Versions.props b/eng/Versions.props index 88cf82b8e..81f1dad8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23117.11 - 8.0.100-preview.2.23117.11 - 8.0.100-preview.2.23117.11 + 8.0.100-preview.2.23117.17 + 8.0.100-preview.2.23117.17 + 8.0.100-preview.2.23117.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a93392872c1bd2149643482405c8ce6949136398 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 21:49:13 +0000 Subject: [PATCH 241/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.17 -> To Version 8.0.100-preview.2.23117.18 --- 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 96a8c8abc..b1e041d07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 765c72d71c7cd5d73340b4b150d8c7d582a2a90b + 49569598fe4856aada9f2c569c56c097ddf83bb5 - + https://github.com/dotnet/sdk - 765c72d71c7cd5d73340b4b150d8c7d582a2a90b + 49569598fe4856aada9f2c569c56c097ddf83bb5 - + https://github.com/dotnet/sdk - 765c72d71c7cd5d73340b4b150d8c7d582a2a90b + 49569598fe4856aada9f2c569c56c097ddf83bb5 - + https://github.com/dotnet/sdk - 765c72d71c7cd5d73340b4b150d8c7d582a2a90b + 49569598fe4856aada9f2c569c56c097ddf83bb5 diff --git a/eng/Versions.props b/eng/Versions.props index 81f1dad8b..2ab8391ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23117.17 - 8.0.100-preview.2.23117.17 - 8.0.100-preview.2.23117.17 + 8.0.100-preview.2.23117.18 + 8.0.100-preview.2.23117.18 + 8.0.100-preview.2.23117.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 076bd81c01549a2444d1a3b5668dedb33859a122 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 23:14:26 +0000 Subject: [PATCH 242/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23117.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23116.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1e041d07..bad041e58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 873553aa95454411b2e2b549f544178bf8689044 - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 49569598fe4856aada9f2c569c56c097ddf83bb5 + 1fc528a6c1a63a9499eafa71d7a9819672546292 - + https://github.com/dotnet/sdk - 49569598fe4856aada9f2c569c56c097ddf83bb5 + 1fc528a6c1a63a9499eafa71d7a9819672546292 - + https://github.com/dotnet/sdk - 49569598fe4856aada9f2c569c56c097ddf83bb5 + 1fc528a6c1a63a9499eafa71d7a9819672546292 - + https://github.com/dotnet/sdk - 49569598fe4856aada9f2c569c56c097ddf83bb5 + 1fc528a6c1a63a9499eafa71d7a9819672546292 @@ -142,9 +142,9 @@ ffe76699011531871532725b317bfcac1d45ef5f - + https://github.com/dotnet/runtime - 76e521c5bba36aa48c1443a6b27e7fdc3331ee19 + 65f5ad06c38fbd0a73583a46889419068534446a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2ab8391ad..5e83d440e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23117.18 - 8.0.100-preview.2.23117.18 - 8.0.100-preview.2.23117.18 + 8.0.100-preview.2.23117.26 + 8.0.100-preview.2.23117.26 + 8.0.100-preview.2.23117.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.3 - 8.0.0-preview.2.23117.2 - 8.0.0-preview.2.23117.2 - 8.0.0-preview.2.23117.2 - 8.0.0-preview.2.23117.2 - 8.0.0-preview.2.23117.2 - 8.0.0-preview.2.23117.2 + 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23117.3 2.1.0 From 72e301ec9952acd14e048b75b7d4b0e4c78c4c42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Feb 2023 00:45:16 +0000 Subject: [PATCH 243/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23117.12 -> To Version 7.0.300-preview.23117.32 --- 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 f9d0dc7b2..79757fa14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 diff --git a/eng/Versions.props b/eng/Versions.props index f2e8d3ce3..a60850d22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23117.12 - 7.0.300-preview.23117.12 - 7.0.300-preview.23117.12 + 7.0.300-preview.23117.32 + 7.0.300-preview.23117.32 + 7.0.300-preview.23117.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6dc7bab6b5e987727c6ae1e5094f6784239fd8ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Feb 2023 01:14:56 +0000 Subject: [PATCH 244/864] Update dependencies from https://github.com/dotnet/sdk build 20230217.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23117.35 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23116.3 (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 bad041e58..0a477b959 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1fc528a6c1a63a9499eafa71d7a9819672546292 + d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b - + https://github.com/dotnet/sdk - 1fc528a6c1a63a9499eafa71d7a9819672546292 + d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b - + https://github.com/dotnet/sdk - 1fc528a6c1a63a9499eafa71d7a9819672546292 + d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b - + https://github.com/dotnet/sdk - 1fc528a6c1a63a9499eafa71d7a9819672546292 + d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b @@ -151,9 +151,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 + c5cceaabe1b83f8aaea2f29792157b6307b29686 diff --git a/eng/Versions.props b/eng/Versions.props index 5e83d440e..fe1e8f1da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23117.26 - 8.0.100-preview.2.23117.26 - 8.0.100-preview.2.23117.26 + 8.0.100-preview.2.23117.35 + 8.0.100-preview.2.23117.35 + 8.0.100-preview.2.23117.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccd9cf9b378ccd6afdb930323baaf55a54ec87aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 17:22:08 +0000 Subject: [PATCH 245/864] Merged PR 29724: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.7 to 7.0.4-servicing.23117.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23115.7 to 7.0.4-servicing.23117.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23073.1 to 7.0.4-servicing.23115.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230217.22 - **Date Produced**: February 17, 2023 10:14:25 PM UTC - **Commit**: 92a1d7a8a10ec18349db67faf281565af9d0bee7 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23117.5 to 7.0.104-servicing.23117.22][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23117.5 to 7.0.104-servicing.23117.22][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23117.5 to 7.0.... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd5b599f6..c8b31ef52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c9a1efef..f6804167b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c + 9b17045c60798049608366deecd4a9bd1878ec08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c + 9b17045c60798049608366deecd4a9bd1878ec08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c + 9b17045c60798049608366deecd4a9bd1878ec08 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 60e0e8360d2c4b39506ec0166a6cd8f6b40b6f6c + 9b17045c60798049608366deecd4a9bd1878ec08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 378d9d9a2ffa93defb6326895edf0415d1ba0346 + 7f2e8bc9dbfeaec6465e18080cf1419189149602 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 378d9d9a2ffa93defb6326895edf0415d1ba0346 + 7f2e8bc9dbfeaec6465e18080cf1419189149602 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 378d9d9a2ffa93defb6326895edf0415d1ba0346 + 7f2e8bc9dbfeaec6465e18080cf1419189149602 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 378d9d9a2ffa93defb6326895edf0415d1ba0346 + 7f2e8bc9dbfeaec6465e18080cf1419189149602 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a09c7d17212981cb4fd5907fa6a6214966a366d + 495efad606400c499f83d14019065ae029da5c1d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6f7e01a66..4720d3589 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ - 7.0.3-servicing.23073.1 + 7.0.4-servicing.23115.2 @@ -64,20 +64,20 @@ 7.0.104 - 7.0.104-servicing.23117.5 - 7.0.104-servicing.23117.5 + 7.0.104-servicing.23117.33 + 7.0.104-servicing.23117.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.1 - 7.0.4-servicing.23114.5 - 7.0.4-servicing.23114.5 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 7.0.4 7.0.4 7.0.4 @@ -86,8 +86,8 @@ - 7.0.4-servicing.23115.7 - 7.0.4-servicing.23115.7 + 7.0.4-servicing.23117.3 + 7.0.4-servicing.23117.3 7.0.4 7.0.4 From f0a82614777ab0a55a514221757b775d1bfcb128 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 19:15:28 +0000 Subject: [PATCH 246/864] Merged PR 29731: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230218.3 - **Date Produced**: February 18, 2023 5:55:20 PM UTC - **Commit**: 4b16338ed0bf771a31b2ecad1f7d342b94148615 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23117.4 to 6.0.407-servicing.23118.3][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23117.4 to 6.0.407-servicing.23118.3][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.5][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC62fcdba&targetVersion=GC4b16338&_a=files [2]: https://dev... --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index bfd18eeea..f6f29d76e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,12 +17,9 @@ - - - - + @@ -49,12 +46,9 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e4a1bf4a..ee6a74782 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62fcdba42952b2e66c959c1dd513de609c40d84b + 4b16338ed0bf771a31b2ecad1f7d342b94148615 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62fcdba42952b2e66c959c1dd513de609c40d84b + 4b16338ed0bf771a31b2ecad1f7d342b94148615 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8450953cc..13723ff18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 @@ -56,8 +56,8 @@ - 6.0.407-servicing.23117.4 - 6.0.407-servicing.23117.4 + 6.0.407-servicing.23118.3 + 6.0.407-servicing.23118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23115.10 - 6.0.15-servicing.23115.10 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 6.0.15 6.0.15 From 5e9562f58f6a79ec8958794f85883a7a846f8e41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 19:21:34 +0000 Subject: [PATCH 247/864] Merged PR 29732: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.310 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23074.5 to 6.0.310-servicing.23117.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.310 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runti... --- NuGet.config | 30 ++++--------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6be40a3b4..95e86aeb4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,20 @@ - - - + - - + - - - + - - - + @@ -48,22 +41,15 @@ - - - + - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c4a9627c..a5fcc063d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffeddec3efcbb43f226550c3b8bfe8d11765f723 + 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffeddec3efcbb43f226550c3b8bfe8d11765f723 + 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffeddec3efcbb43f226550c3b8bfe8d11765f723 + 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 54b8f37b145c05ddfe75705c6fd03cab42f2c532 + 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 54b8f37b145c05ddfe75705c6fd03cab42f2c532 + 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 739c9f826..18e94929e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 - 6.0.309 + 6.0.310 @@ -44,44 +44,44 @@ - 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 + 6.0.15 + 6.0.15 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.309-servicing.23074.34 - 6.0.309-servicing.23074.34 + 6.0.310-servicing.23118.2 + 6.0.310-servicing.23118.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.7 + 6.0.8 - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 + 6.0.15 + 6.0.15 + 6.0.15 + 6.0.15 2.1.0 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 + 6.0.15 + 6.0.15 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.309 + 6.0.310 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1ea08b8f5f46b03d411c45c746417aabac737aaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 23:39:20 +0000 Subject: [PATCH 248/864] Merged PR 29730: [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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.15-servicing.23114.15 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.115 to 6.0.115 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.115-servicing.23115.4 to 6.0.115-servicing.23117.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.115 to 6.0.115 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23074... --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d6950b95..ddb02c357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bbc60497..fe05582b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a44ab75d514605822a8b889033df94c1866dea03 + 346efd6f9a844a885551741b31f9abd256b9016f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a44ab75d514605822a8b889033df94c1866dea03 + 346efd6f9a844a885551741b31f9abd256b9016f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 0d02a9fc71d6e5da74daac3a136042f3790283b2 + 0c39542771ca202430d0042f710622b5b916ff0a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 78b6082f4..0660bf742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.115-servicing.23116.18 - 6.0.115-servicing.23116.18 + 6.0.115-servicing.23118.1 + 6.0.115-servicing.23118.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.15-servicing.23114.15 - 6.0.15-servicing.23114.15 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 6.0.15 6.0.15 6.0.15 @@ -78,8 +78,8 @@ - 6.0.15-servicing.23115.10 - 6.0.15-servicing.23115.10 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 6.0.15 6.0.15 From 35b37becd3f444bbb3dcf6f0a771ac2a7e073154 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 23:39:34 +0000 Subject: [PATCH 249/864] Merged PR 29733: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23117.3 to 7.0.4-servicing.23117.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23117.3 to 7.0.4-servicing.23117.8 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.4-servicing.23115.2 to 7.0.4-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230218.4 - **Date Produced**: February 18, 2023 6:06:07 PM UTC - **Commit**: 7c60234d8e48bcfc27d040ea06e0e30687962319 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23117.33 to 7.0.104-servicing.23118.4][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23117.33 to 7.0.104-servicing.23118.4][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23117.33 to 7.0.104-servicing.23118.4][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23117.3 to 7.0.4-servicing.23117.8][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23117.3 to 7.0.4-servicing.23117.8][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.4-servicing.23115.2 to 7.0.4-servicing.231... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8b31ef52..4c89dde70 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6804167b..6002e19ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b17045c60798049608366deecd4a9bd1878ec08 + 9ee3b82ff96a470c23345dfda6152d7bb73b383a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b17045c60798049608366deecd4a9bd1878ec08 + 9ee3b82ff96a470c23345dfda6152d7bb73b383a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b17045c60798049608366deecd4a9bd1878ec08 + 9ee3b82ff96a470c23345dfda6152d7bb73b383a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b17045c60798049608366deecd4a9bd1878ec08 + 9ee3b82ff96a470c23345dfda6152d7bb73b383a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f2e8bc9dbfeaec6465e18080cf1419189149602 + 7c60234d8e48bcfc27d040ea06e0e30687962319 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f2e8bc9dbfeaec6465e18080cf1419189149602 + 7c60234d8e48bcfc27d040ea06e0e30687962319 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f2e8bc9dbfeaec6465e18080cf1419189149602 + 7c60234d8e48bcfc27d040ea06e0e30687962319 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f2e8bc9dbfeaec6465e18080cf1419189149602 + 7c60234d8e48bcfc27d040ea06e0e30687962319 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cce692f665cbefe335ed33369897cea328d5fbcf + 84d909e676d61df36f5c7aa269e5c471fc6530bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 495efad606400c499f83d14019065ae029da5c1d + fa6e95d0d2287982dade926f08843e78ecb32e2b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4720d3589..ea0a126a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.3-servicing.23072.1 + 7.0.4-servicing.23107.7 - 7.0.4-servicing.23115.2 + 7.0.4-servicing.23117.2 @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23117.33 - 7.0.104-servicing.23117.33 + 7.0.104-servicing.23118.4 + 7.0.104-servicing.23118.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.4-servicing.23117.3 - 7.0.4-servicing.23117.3 + 7.0.4-servicing.23117.8 + 7.0.4-servicing.23117.8 7.0.4 7.0.4 From 83bd64eaad2cfb4066103d471e9aa55647112390 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 07:33:24 +0000 Subject: [PATCH 250/864] Update dependencies from https://github.com/dotnet/sdk build 20230219.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23117.12 -> To Version 7.0.300-preview.23119.5 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230216-01 -> To Version 17.6.0-preview-20230217-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ---------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60f566b46..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,11 +15,6 @@ - - - - - @@ -46,11 +41,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79757fa14..0871bf28a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - ffe76699011531871532725b317bfcac1d45ef5f + 27964da9af0a67fd25bb75488a6582eecbf8fe03 diff --git a/eng/Versions.props b/eng/Versions.props index a60850d22..d9f11e43b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23117.32 - 7.0.300-preview.23117.32 - 7.0.300-preview.23117.32 + 7.0.300-preview.23119.5 + 7.0.300-preview.23119.5 + 7.0.300-preview.23119.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230216-01 + 17.6.0-preview-20230217-01 From e8b2259aab26331a53571e1b907946d8f6337acd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 08:04:43 +0000 Subject: [PATCH 251/864] Update dependencies from https://github.com/dotnet/sdk build 20230219.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23119.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23116.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a477b959..81959d540 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 65f5ad06c38fbd0a73583a46889419068534446a - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d - + https://github.com/dotnet/aspnetcore - ee999df00d443356e3b97031c5bfe198909a2076 + c382c35b6ec5896008f287a88ea9a73fd0bf5c4d https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b + 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 - + https://github.com/dotnet/sdk - d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b + 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 - + https://github.com/dotnet/sdk - d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b + 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 - + https://github.com/dotnet/sdk - d1e0f7c96fdbbcb7bb352f86cf57cef2afd17e8b + 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 @@ -137,9 +137,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - ffe76699011531871532725b317bfcac1d45ef5f + 27964da9af0a67fd25bb75488a6582eecbf8fe03 diff --git a/eng/Versions.props b/eng/Versions.props index fe1e8f1da..86d2cbb96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23117.1 - 8.0.0-preview.2.23117.1 - 8.0.0-preview.2.23117.1 - 8.0.0-preview.2.23117.1 - 8.0.0-preview.2.23117.1 - 8.0.0-preview.2.23117.1 - 8.0.0-preview.2.23117.1 + 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23118.2 0.2.0 - 8.0.100-preview.2.23117.35 - 8.0.100-preview.2.23117.35 - 8.0.100-preview.2.23117.35 + 8.0.100-preview.2.23119.6 + 8.0.100-preview.2.23119.6 + 8.0.100-preview.2.23119.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230216-01 + 17.6.0-preview-20230217-01 8.0.0-alpha.1.22557.12 From 2b223debaec238d1c3a0fa7421835bb351a52832 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 08:58:43 +0000 Subject: [PATCH 252/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23120.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81959d540..33292d1f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 873553aa95454411b2e2b549f544178bf8689044 + 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/windowsdesktop - 873553aa95454411b2e2b549f544178bf8689044 + 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/windowsdesktop - 873553aa95454411b2e2b549f544178bf8689044 + 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/windowsdesktop - 873553aa95454411b2e2b549f544178bf8689044 + 998b5101ac37f8f5cf913334006429cf71d1dded https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 + 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 - + https://github.com/dotnet/sdk - 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 + 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 - + https://github.com/dotnet/sdk - 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 + 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 - + https://github.com/dotnet/sdk - 31e3eb0a916631233f0ac0a7105fb3c1e4fc3862 + 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 - + https://github.com/dotnet/winforms - c90f5134458cfdfd67cdae0a3fcaf1a3b7f14cf0 + 5b971a53cbb1afe38cf990416bea69a5bcbb5d2a - + https://github.com/dotnet/wpf - a26c10aabc0a5e068c4e1b3aecdb39dfeb52c966 + 1d302568334aff201ec825827b135c22787c73b7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 86d2cbb96..343d5e05f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23115.5 + 8.0.0-preview.2.23117.6 - 8.0.0-preview.2.23116.3 + 8.0.0-preview.2.23117.8 @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23119.6 - 8.0.100-preview.2.23119.6 - 8.0.100-preview.2.23119.6 + 8.0.100-preview.2.23120.1 + 8.0.100-preview.2.23120.1 + 8.0.100-preview.2.23120.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.2.23116.3 - 8.0.0-preview.2.23116.3 - 8.0.0-preview.2.23116.3 - 8.0.0-preview.2.23116.3 + 8.0.0-preview.2.23119.1 + 8.0.0-preview.2.23119.1 + 8.0.0-preview.2.23119.1 + 8.0.0-preview.2.23119.1 From 583578d15aef638a955beac8ff8aa27bc1c7ee13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 10:03:28 +0000 Subject: [PATCH 253/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23120.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.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 33292d1f5..d0e6a8ecd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 + 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 - + https://github.com/dotnet/sdk - 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 + 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 - + https://github.com/dotnet/sdk - 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 + 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 - + https://github.com/dotnet/sdk - 8f9419f27eeea8e84bd443aec7a6dd717f80b7a6 + 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 diff --git a/eng/Versions.props b/eng/Versions.props index 343d5e05f..8a69f0555 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23120.1 - 8.0.100-preview.2.23120.1 - 8.0.100-preview.2.23120.1 + 8.0.100-preview.2.23120.2 + 8.0.100-preview.2.23120.2 + 8.0.100-preview.2.23120.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c650002715ea2d078494665d45d44e581fe7020d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 11:05:40 +0000 Subject: [PATCH 254/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23120.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0e6a8ecd..b800c1492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 + f89eb139d40dd798be7a9c33994ab8818756d3fa - + https://github.com/dotnet/sdk - 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 + f89eb139d40dd798be7a9c33994ab8818756d3fa - + https://github.com/dotnet/sdk - 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 + f89eb139d40dd798be7a9c33994ab8818756d3fa - + https://github.com/dotnet/sdk - 0250b102e1192fb26f4c4ab1dfa1f79d32b57847 + f89eb139d40dd798be7a9c33994ab8818756d3fa @@ -142,9 +142,9 @@ 27964da9af0a67fd25bb75488a6582eecbf8fe03 - + https://github.com/dotnet/runtime - 65f5ad06c38fbd0a73583a46889419068534446a + fccf04f8d7c97448e6707de933781ee9df0896a8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8a69f0555..ebef65016 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23120.2 - 8.0.100-preview.2.23120.2 - 8.0.100-preview.2.23120.2 + 8.0.100-preview.2.23120.3 + 8.0.100-preview.2.23120.3 + 8.0.100-preview.2.23120.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23119.4 - 8.0.0-preview.2.23117.3 - 8.0.0-preview.2.23117.3 - 8.0.0-preview.2.23117.3 - 8.0.0-preview.2.23117.3 - 8.0.0-preview.2.23117.3 - 8.0.0-preview.2.23117.3 + 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23119.4 2.1.0 From 8a7ef9f5d4995d275ce9123931f9697dcaaeeb4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 11:23:57 +0000 Subject: [PATCH 255/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23119.5 -> To Version 7.0.300-preview.23120.4 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23117-04 -> To Version 17.6.0-preview-23120-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 0871bf28a..9663cae81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - c5cceaabe1b83f8aaea2f29792157b6307b29686 + bd756efe2f9ddec21afb01807a450a0a83cfd985 diff --git a/eng/Versions.props b/eng/Versions.props index d9f11e43b..12efb93f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23119.5 - 7.0.300-preview.23119.5 - 7.0.300-preview.23119.5 + 7.0.300-preview.23120.4 + 7.0.300-preview.23120.4 + 7.0.300-preview.23120.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fec38f71095bf34e9cde3b44a4624e4054bff98a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 11:58:04 +0000 Subject: [PATCH 256/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23120.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.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 b800c1492..f67d581f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f89eb139d40dd798be7a9c33994ab8818756d3fa + c3df740b1469a0aa2fce4ff95c10151d5b60d128 - + https://github.com/dotnet/sdk - f89eb139d40dd798be7a9c33994ab8818756d3fa + c3df740b1469a0aa2fce4ff95c10151d5b60d128 - + https://github.com/dotnet/sdk - f89eb139d40dd798be7a9c33994ab8818756d3fa + c3df740b1469a0aa2fce4ff95c10151d5b60d128 - + https://github.com/dotnet/sdk - f89eb139d40dd798be7a9c33994ab8818756d3fa + c3df740b1469a0aa2fce4ff95c10151d5b60d128 diff --git a/eng/Versions.props b/eng/Versions.props index ebef65016..9d4df445b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23120.3 - 8.0.100-preview.2.23120.3 - 8.0.100-preview.2.23120.3 + 8.0.100-preview.2.23120.5 + 8.0.100-preview.2.23120.5 + 8.0.100-preview.2.23120.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 88ef70be4b2b853422adfdd3218fe7705cf2dfab Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Feb 2023 23:02:27 +0000 Subject: [PATCH 257/864] Merged PR 29737: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23117.8 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23117.8 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.4-servicing.23117.2 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230219.1 - **Date Produced**: February 19, 2023 7:17:30 PM UTC - **Commit**: e82a53f78a008c744d121e74cff33d66d536428b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23118.4 to 7.0.104-servicing.23119.1][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23118.4 to 7.0.104-servicing.23119.1][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23118.4 to 7.0.104-servicing.23119.1][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23117.8 to 7.0.4-servicing.23118.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23117.8 to 7.0.4-servicing.23118.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.4-servicing.23117.2 to 7.0.4-servicing.23117.... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4c89dde70..cf25f2691 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6002e19ad..f87ce4eed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9ee3b82ff96a470c23345dfda6152d7bb73b383a + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9ee3b82ff96a470c23345dfda6152d7bb73b383a + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9ee3b82ff96a470c23345dfda6152d7bb73b383a + 27813f8dc98831931e881b37d1847be3300e76fc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9ee3b82ff96a470c23345dfda6152d7bb73b383a + 27813f8dc98831931e881b37d1847be3300e76fc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c60234d8e48bcfc27d040ea06e0e30687962319 + e82a53f78a008c744d121e74cff33d66d536428b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c60234d8e48bcfc27d040ea06e0e30687962319 + e82a53f78a008c744d121e74cff33d66d536428b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c60234d8e48bcfc27d040ea06e0e30687962319 + e82a53f78a008c744d121e74cff33d66d536428b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c60234d8e48bcfc27d040ea06e0e30687962319 + e82a53f78a008c744d121e74cff33d66d536428b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 84d909e676d61df36f5c7aa269e5c471fc6530bf + 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa6e95d0d2287982dade926f08843e78ecb32e2b + 0315841ebb89a21c717002224ad9d39f3c21320a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ea0a126a0..3621d8edf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.4-servicing.23107.7 + 7.0.4-servicing.23117.7 - 7.0.4-servicing.23117.2 + 7.0.4-servicing.23117.7 @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23118.4 - 7.0.104-servicing.23118.4 + 7.0.104-servicing.23119.1 + 7.0.104-servicing.23119.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.4-servicing.23117.8 - 7.0.4-servicing.23117.8 + 7.0.4-servicing.23118.3 + 7.0.4-servicing.23118.3 7.0.4 7.0.4 From 4a27cf2f2644a0c8c2cb5172efe55feb6153fdab Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 01:19:55 +0000 Subject: [PATCH 258/864] Merged PR 29745: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230220.6 - **Date Produced**: February 20, 2023 11:49:19 PM UTC - **Commit**: 0bd9efc90be8a0219f562515a2d42527b6d84c50 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23119.1 to 7.0.104-servicing.23120.6][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23119.1 to 7.0.104-servicing.23120.6][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23119.1 to 7.0.104-servicing.23120.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.4 to 7.0.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3][2] - **dotnet-dev-certs**: [from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3][2] - **dotnet-user-jwts**: [from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3][2] - **dotnet-user-secrets**: [from 7.0.4-servicing.23116.4 to 7.0.4-servicing.23119.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe82a53f&targetVersion=GC0bd9efc&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index cf25f2691..6ed66021a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f87ce4eed..54a99923d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90d5b7ef35b89c5051c45b3326c75000d6842666 + e56abc45c4f8adc518abfc11a59849d616431e2c https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82a53f78a008c744d121e74cff33d66d536428b + 0bd9efc90be8a0219f562515a2d42527b6d84c50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82a53f78a008c744d121e74cff33d66d536428b + 0bd9efc90be8a0219f562515a2d42527b6d84c50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82a53f78a008c744d121e74cff33d66d536428b + 0bd9efc90be8a0219f562515a2d42527b6d84c50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82a53f78a008c744d121e74cff33d66d536428b + 0bd9efc90be8a0219f562515a2d42527b6d84c50 diff --git a/eng/Versions.props b/eng/Versions.props index 3621d8edf..80bade6bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 7.0.4 7.0.4 - 7.0.4-servicing.23116.4 - 7.0.4-servicing.23116.4 - 7.0.4-servicing.23116.4 - 7.0.4-servicing.23116.4 - 7.0.4-servicing.23116.4 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 0.2.0 @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23119.1 - 7.0.104-servicing.23119.1 + 7.0.104-servicing.23120.6 + 7.0.104-servicing.23120.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bf6405f37c307328ec87be594d81cef749110ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 03:28:33 +0000 Subject: [PATCH 259/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23120.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f67d581f5..0760db628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c3df740b1469a0aa2fce4ff95c10151d5b60d128 + 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 - + https://github.com/dotnet/sdk - c3df740b1469a0aa2fce4ff95c10151d5b60d128 + 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 - + https://github.com/dotnet/sdk - c3df740b1469a0aa2fce4ff95c10151d5b60d128 + 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 - + https://github.com/dotnet/sdk - c3df740b1469a0aa2fce4ff95c10151d5b60d128 + 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 @@ -137,23 +137,23 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 27964da9af0a67fd25bb75488a6582eecbf8fe03 + 537a174d393a0c8770aa472d5eb8a3c45271ce1b - + https://github.com/dotnet/runtime - fccf04f8d7c97448e6707de933781ee9df0896a8 + ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec https://github.com/dotnet/roslyn 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - c5cceaabe1b83f8aaea2f29792157b6307b29686 + 5476e4396fdcec6e3578ba595082f18f2130ca21 diff --git a/eng/Versions.props b/eng/Versions.props index 9d4df445b..b4240903d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23120.5 - 8.0.100-preview.2.23120.5 - 8.0.100-preview.2.23120.5 + 8.0.100-preview.2.23120.12 + 8.0.100-preview.2.23120.12 + 8.0.100-preview.2.23120.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23120.3 - 8.0.0-preview.2.23119.4 - 8.0.0-preview.2.23119.4 - 8.0.0-preview.2.23119.4 - 8.0.0-preview.2.23119.4 - 8.0.0-preview.2.23119.4 - 8.0.0-preview.2.23119.4 + 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.3 2.1.0 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230217-01 + 17.6.0-preview-20230220-01 8.0.0-alpha.1.22557.12 From bee3089f2ab1d306bd96defb3ac97651c7b44a7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 03:56:32 +0000 Subject: [PATCH 260/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23119.5 -> To Version 7.0.300-preview.23120.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230217-01 -> To Version 17.6.0-preview-20230220-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9663cae81..e353d637c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 27964da9af0a67fd25bb75488a6582eecbf8fe03 + 537a174d393a0c8770aa472d5eb8a3c45271ce1b diff --git a/eng/Versions.props b/eng/Versions.props index 12efb93f2..40d3a82eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.4 - 7.0.300-preview.23120.4 - 7.0.300-preview.23120.4 + 7.0.300-preview.23120.13 + 7.0.300-preview.23120.13 + 7.0.300-preview.23120.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230217-01 + 17.6.0-preview-20230220-01 From 41e60944bb3bf0c7e6a98e28c6f30b86a43dfd8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 07:24:43 +0000 Subject: [PATCH 261/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23120.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0760db628..b1893327e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c - + https://github.com/dotnet/aspnetcore - c382c35b6ec5896008f287a88ea9a73fd0bf5c4d + d1e184bef07ff58d9c093403d583a296d2e73c1c https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 + d0b016938c1ea33a74294a4e7e164365e76d3ce2 - + https://github.com/dotnet/sdk - 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 + d0b016938c1ea33a74294a4e7e164365e76d3ce2 - + https://github.com/dotnet/sdk - 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 + d0b016938c1ea33a74294a4e7e164365e76d3ce2 - + https://github.com/dotnet/sdk - 0f2d02b78540d3b3d5c6455aa0bfde2154b714a1 + d0b016938c1ea33a74294a4e7e164365e76d3ce2 @@ -142,9 +142,9 @@ 537a174d393a0c8770aa472d5eb8a3c45271ce1b - + https://github.com/dotnet/runtime - ac7afb9ccb88b895eeb3264e38ab22d0c5d726ec + 6d325e1aa46879677a56b722fc20ef919ec173f5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b4240903d..e0257af81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,38 +58,38 @@ - 8.0.0-preview.2.23118.2 - 8.0.0-preview.2.23118.2 - 8.0.0-preview.2.23118.2 - 8.0.0-preview.2.23118.2 - 8.0.0-preview.2.23118.2 - 8.0.0-preview.2.23118.2 - 8.0.0-preview.2.23118.2 + 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23120.8 0.2.0 - 8.0.100-preview.2.23120.12 - 8.0.100-preview.2.23120.12 - 8.0.100-preview.2.23120.12 + 8.0.100-preview.2.23120.15 + 8.0.100-preview.2.23120.15 + 8.0.100-preview.2.23120.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.4 - 8.0.0-preview.2.23120.3 - 8.0.0-preview.2.23120.3 - 8.0.0-preview.2.23120.3 - 8.0.0-preview.2.23120.3 - 8.0.0-preview.2.23120.3 - 8.0.0-preview.2.23120.3 + 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.4 2.1.0 From cebe98b5b60dec4ab85134514404e900ecbf6dcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 07:47:09 +0000 Subject: [PATCH 262/864] Update dependencies from https://github.com/dotnet/sdk build 20230220.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.13 -> To Version 7.0.300-preview.23120.16 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23120-01 -> To Version 17.6.0-preview-23121-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 e353d637c..a3c493549 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - bd756efe2f9ddec21afb01807a450a0a83cfd985 + 02c4162874fb061081978f49295c3c3cee25978a diff --git a/eng/Versions.props b/eng/Versions.props index 40d3a82eb..2f9d73bc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.13 - 7.0.300-preview.23120.13 - 7.0.300-preview.23120.13 + 7.0.300-preview.23120.16 + 7.0.300-preview.23120.16 + 7.0.300-preview.23120.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5d9462454d200e2b71b0813b9036c0a2ac0fab68 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 21 Feb 2023 00:37:18 -0800 Subject: [PATCH 263/864] Update implicit version for March release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 5ecb3a19f..3bdff216f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 13 + 14 From 2c1f6eb45460a757da03f162e9ce9bf1da27263b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 09:03:14 +0000 Subject: [PATCH 264/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.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 b1893327e..90a771b7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d0b016938c1ea33a74294a4e7e164365e76d3ce2 + c388baa3324af0d0cd93ccb3898d9f1cb0ab748f - + https://github.com/dotnet/sdk - d0b016938c1ea33a74294a4e7e164365e76d3ce2 + c388baa3324af0d0cd93ccb3898d9f1cb0ab748f - + https://github.com/dotnet/sdk - d0b016938c1ea33a74294a4e7e164365e76d3ce2 + c388baa3324af0d0cd93ccb3898d9f1cb0ab748f - + https://github.com/dotnet/sdk - d0b016938c1ea33a74294a4e7e164365e76d3ce2 + c388baa3324af0d0cd93ccb3898d9f1cb0ab748f diff --git a/eng/Versions.props b/eng/Versions.props index e0257af81..e4b541a21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23120.15 - 8.0.100-preview.2.23120.15 - 8.0.100-preview.2.23120.15 + 8.0.100-preview.2.23121.1 + 8.0.100-preview.2.23121.1 + 8.0.100-preview.2.23121.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1056157e97d5d609aa077a538dac37df696b3bcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 10:09:10 +0000 Subject: [PATCH 265/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90a771b7a..6b6da517f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 998b5101ac37f8f5cf913334006429cf71d1dded - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c388baa3324af0d0cd93ccb3898d9f1cb0ab748f + c87a92f34b7faec6c4631b01e64ead6df4a037af - + https://github.com/dotnet/sdk - c388baa3324af0d0cd93ccb3898d9f1cb0ab748f + c87a92f34b7faec6c4631b01e64ead6df4a037af - + https://github.com/dotnet/sdk - c388baa3324af0d0cd93ccb3898d9f1cb0ab748f + c87a92f34b7faec6c4631b01e64ead6df4a037af - + https://github.com/dotnet/sdk - c388baa3324af0d0cd93ccb3898d9f1cb0ab748f + c87a92f34b7faec6c4631b01e64ead6df4a037af @@ -142,9 +142,9 @@ 537a174d393a0c8770aa472d5eb8a3c45271ce1b - + https://github.com/dotnet/runtime - 6d325e1aa46879677a56b722fc20ef919ec173f5 + a0d28f4838a3075d3080c9ff5690e26969cbe67f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e4b541a21..5bc59df1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23121.1 - 8.0.100-preview.2.23121.1 - 8.0.100-preview.2.23121.1 + 8.0.100-preview.2.23121.2 + 8.0.100-preview.2.23121.2 + 8.0.100-preview.2.23121.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.5 - 8.0.0-preview.2.23120.4 - 8.0.0-preview.2.23120.4 - 8.0.0-preview.2.23120.4 - 8.0.0-preview.2.23120.4 - 8.0.0-preview.2.23120.4 - 8.0.0-preview.2.23120.4 + 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.5 2.1.0 From 315d32422cde7631fcacc00bedf98aa2a53d1952 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 11:05:46 +0000 Subject: [PATCH 266/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.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 6b6da517f..39a1aeb13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c87a92f34b7faec6c4631b01e64ead6df4a037af + 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 - + https://github.com/dotnet/sdk - c87a92f34b7faec6c4631b01e64ead6df4a037af + 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 - + https://github.com/dotnet/sdk - c87a92f34b7faec6c4631b01e64ead6df4a037af + 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 - + https://github.com/dotnet/sdk - c87a92f34b7faec6c4631b01e64ead6df4a037af + 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 diff --git a/eng/Versions.props b/eng/Versions.props index 5bc59df1c..a46baa056 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23121.2 - 8.0.100-preview.2.23121.2 - 8.0.100-preview.2.23121.2 + 8.0.100-preview.2.23121.3 + 8.0.100-preview.2.23121.3 + 8.0.100-preview.2.23121.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b316fbb5234ea5fddf35785f92876d66c5c91f55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 13:28:55 +0000 Subject: [PATCH 267/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230216.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23106.1 -> To Version 8.0.0-alpha.1.23116.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2165068e..2a1615bf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,9 +183,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 46f5e8e5419df6689022dccf5ed5a7fd153cb601 + 89bdfc9cc4ceea68fa9113cace36ba7ba401f34e From 4245a405658c99d46455cfb04064c1c86f470e51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 15:01:01 +0000 Subject: [PATCH 268/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230221.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23117.1 -> To Version 8.0.0-alpha.1.23121.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2165068e..460ffbcf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - e0402855655756b9562138b327763e1c97d0b908 + f9151e1fa9879f761f2b3d2b606fa53e37f26325 From e8d6c6cc1402b997745cef53105c73097af8edf2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 16:03:49 +0000 Subject: [PATCH 269/864] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (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 ddb02c357..ac5080f79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe05582b5..734e2f51a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 346efd6f9a844a885551741b31f9abd256b9016f + fc573c39acc28d9287e7aa638bd837922777e1b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 346efd6f9a844a885551741b31f9abd256b9016f + fc573c39acc28d9287e7aa638bd837922777e1b0 diff --git a/eng/Versions.props b/eng/Versions.props index 0660bf742..5cab77811 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 0.2.0 - 6.0.115-servicing.23118.1 - 6.0.115-servicing.23118.1 + 6.0.115-servicing.23120.14 + 6.0.115-servicing.23120.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b6efc653172b1a452168b39d406b7cdf5ff8de83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 16:06:55 +0000 Subject: [PATCH 270/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230221.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23117.1 -> To Version 8.0.0-alpha.1.23121.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 460ffbcf8..84c9f2412 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - f9151e1fa9879f761f2b3d2b606fa53e37f26325 + 0fc024c4bae28eb8e119df056efa9606bb61bb53 From 50ea26755909c7e19d7569a2a3db2837aa875d72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 16:38:55 +0000 Subject: [PATCH 271/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39a1aeb13..ed62f812c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 + 1c3c95edfbd68bc0aff05d9c16bee25a24179dba - + https://github.com/dotnet/sdk - 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 + 1c3c95edfbd68bc0aff05d9c16bee25a24179dba - + https://github.com/dotnet/sdk - 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 + 1c3c95edfbd68bc0aff05d9c16bee25a24179dba - + https://github.com/dotnet/sdk - 3d71e0074b6f015a83460b6d0d6fe7ca4e7f8b32 + 1c3c95edfbd68bc0aff05d9c16bee25a24179dba @@ -137,9 +137,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 537a174d393a0c8770aa472d5eb8a3c45271ce1b + 3990c633bcf933291f40d44c0b7586c3a6e89d55 diff --git a/eng/Versions.props b/eng/Versions.props index a46baa056..ad68c16eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23121.3 - 8.0.100-preview.2.23121.3 - 8.0.100-preview.2.23121.3 + 8.0.100-preview.2.23121.5 + 8.0.100-preview.2.23121.5 + 8.0.100-preview.2.23121.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230220-01 + 17.6.0-preview-20230221-02 8.0.0-alpha.1.22557.12 From c884d8c54ea1b6d025b5919871c5c524468aece0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 17:00:45 +0000 Subject: [PATCH 272/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.16 -> To Version 7.0.300-preview.23121.4 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230220-01 -> To Version 17.6.0-preview-20230221-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3c493549..1c471c337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 537a174d393a0c8770aa472d5eb8a3c45271ce1b + 3990c633bcf933291f40d44c0b7586c3a6e89d55 diff --git a/eng/Versions.props b/eng/Versions.props index 2f9d73bc6..d94d82c30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.16 - 7.0.300-preview.23120.16 - 7.0.300-preview.23120.16 + 7.0.300-preview.23121.4 + 7.0.300-preview.23121.4 + 7.0.300-preview.23121.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230220-01 + 17.6.0-preview-20230221-02 From ce42123fa2c75e9f79b6cd3a38b7c17558cb5d99 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 21 Feb 2023 11:10:40 -0600 Subject: [PATCH 273/864] Update source-build artifacts, prebuilts and test baselines (#15582) --- src/SourceBuild/content/eng/Versions.props | 2 +- .../assets/baselines/MsftToSbSdk.diff | 139 +- .../assets/baselines/PoisonUsage.txt | 1156 +---------------- 3 files changed, 93 insertions(+), 1204 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 091df71f6..58aeb46aa 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -25,6 +25,6 @@ necessary, and this property is removed from the file. --> 0.1.0-8.0.100-5.centos.8-x64 - 0.1.0-8.0.100-3.centos.8-x64 + 0.1.0-8.0.100-6.centos.8-x64 diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 3276c1cb4..3300d8daf 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -44,6 +44,31 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ +@@ ------------ @@ + ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll + ./sdk-manifests/ + ./sdk-manifests/x.y.z/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.android/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.android/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.android/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.ios/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.ios/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.ios/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.macos/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.macos/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.macos/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.maui/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.maui/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.maui/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/WorkloadManifest.targets + ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ + ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/WorkloadManifest.json + ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/WorkloadManifest.targets @@ ------------ @@ ./sdk/x.y.z/AppHostTemplate/apphost ./sdk/x.y.z/cs/ @@ -57,8 +82,8 @@ index ------------ ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -96,10 +121,6 @@ index ------------ ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ @@ ------------ @@ - ./sdk/x.y.z/datacollector.deps.json - ./sdk/x.y.z/datacollector.dll - ./sdk/x.y.z/datacollector.dll.config --./sdk/x.y.z/datacollector.exe ./sdk/x.y.z/datacollector.runtimeconfig.json ./sdk/x.y.z/de/ ./sdk/x.y.z/de/dotnet.resources.dll @@ -112,8 +133,8 @@ index ------------ ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/de/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -147,9 +168,9 @@ index ------------ ./sdk/x.y.z/de/System.CommandLine.resources.dll -./sdk/x.y.z/de/Test.Utility.resources.dll -./sdk/x.y.z/de/vstest.console.resources.dll - ./sdk/x.y.z/dotnet-watch.deps.json - ./sdk/x.y.z/dotnet-watch.runtimeconfig.json ./sdk/x.y.z/dotnet.deps.json + ./sdk/x.y.z/dotnet.dll + ./sdk/x.y.z/dotnet.runtimeconfig.json @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -167,25 +188,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/pl/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/pl/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.Rendering.dll @@ -196,6 +213,7 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.TypedParts.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Configuration.ConfigurationManager.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.IO.Pipelines.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll @@ -204,13 +222,14 @@ index ------------ +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Threading.Channels.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.AnalyzerUtilities.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Scripting.dll @@ -248,11 +267,12 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ - ./sdk/x.y.z/DotNetWatch.targets + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/zh-Hant/System.CommandLine.resources.dll ./sdk/x.y.z/es/ ./sdk/x.y.z/es/dotnet.resources.dll -./sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -264,8 +284,8 @@ index ------------ ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/es/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -402,8 +422,8 @@ index ------------ ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -452,11 +472,11 @@ index ------------ ./sdk/x.y.z/FSharp/runtimes/win/lib/ ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/ ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.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.Diagnostics.EventLog.dll +./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 @@ -477,8 +497,8 @@ index ------------ ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/it/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -523,8 +543,8 @@ index ------------ ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -569,8 +589,8 @@ index ------------ ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -606,8 +626,9 @@ index ------------ -./sdk/x.y.z/ko/vstest.console.resources.dll ./sdk/x.y.z/Microsoft.ApplicationInsights.dll ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll ++./sdk/x.y.z/Microsoft.Bcl.AsyncInterfaces.dll ./sdk/x.y.z/Microsoft.Build.dll -@@ ------------ @@ + ./sdk/x.y.z/Microsoft.Build.Framework.dll ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll ./sdk/x.y.z/Microsoft.Build.Utilities.Core.dll @@ -622,10 +643,10 @@ index ------------ +./sdk/x.y.z/Microsoft.TestPlatform.TestHostRuntimeProvider.dll ./sdk/x.y.z/Microsoft.TestPlatform.Utilities.dll ./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll --./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml ./sdk/x.y.z/Microsoft.VisualBasic.CrossTargeting.targets ./sdk/x.y.z/Microsoft.VisualBasic.CurrentVersion.targets ./sdk/x.y.z/Microsoft.VisualBasic.targets +-./sdk/x.y.z/Microsoft.VisualStudio.Setup.Configuration.Interop.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll +./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll @@ -646,8 +667,8 @@ index ------------ ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -692,8 +713,8 @@ index ------------ ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -734,13 +755,8 @@ 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.Reflection.Metadata.dll +./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll ./sdk/x.y.z/Roslyn/bincore/tr/ ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll @@ -758,8 +774,8 @@ index ------------ ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -797,32 +813,21 @@ index ------------ ./sdk/x.y.z/runtimes/ ./sdk/x.y.z/runtimes/any/ @@ ------------ @@ - ./sdk/x.y.z/runtimes/any/native/NuGet.props - ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets - ./sdk/x.y.z/runtimes/any/native/NuGet.targets --./sdk/x.y.z/runtimes/unix/ --./sdk/x.y.z/runtimes/unix/lib/ --./sdk/x.y.z/runtimes/unix/lib/netx.y/ --./sdk/x.y.z/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/runtimes/browser/ -+./sdk/x.y.z/runtimes/browser/lib/ -+./sdk/x.y.z/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/runtimes/win/ - ./sdk/x.y.z/runtimes/win/lib/ - ./sdk/x.y.z/runtimes/win/lib/netx.y/ --./sdk/x.y.z/runtimes/win/lib/netx.y/ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll +-./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll.config + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/netx.y/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/netx.y/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/netx.y/Microsoft.NET.Sdk.BlazorWebAssembly.Tool.deps.json @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentNoLocation.transform ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform @@ -874,6 +879,10 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.Bcl.AsyncInterfaces.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.NET.Sdk.Razor.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.NET.Sdk.Razor.Tasks.dll.config ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Collections.Immutable.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Memory.dll @@ -1373,8 +1382,8 @@ index ------------ ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -1411,11 +1420,7 @@ index ------------ ./sdk/x.y.z/trustedroots/ ./sdk/x.y.z/trustedroots/codesignctl.pem ./sdk/x.y.z/trustedroots/timestampctl.pem -+./sdk/x.y.z/vstest.console - ./sdk/x.y.z/vstest.console.deps.json - ./sdk/x.y.z/vstest.console.dll - ./sdk/x.y.z/vstest.console.dll.config --./sdk/x.y.z/vstest.console.exe +@@ ------------ @@ ./sdk/x.y.z/vstest.console.runtimeconfig.json ./sdk/x.y.z/zh-Hans/ ./sdk/x.y.z/zh-Hans/dotnet.resources.dll @@ -1428,8 +1433,8 @@ index ------------ ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -1474,8 +1479,8 @@ index ------------ ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 2866b7f1e..02d2c7cf5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1,620 +1,56 @@ - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - + AssemblyAttribute @@ -623,562 +59,10 @@ AssemblyAttribute - + AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - + AssemblyAttribute \ No newline at end of file From a3ac48421f136d6d3db06b7c0d7d7ba8d0f38ffc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 18:38:49 +0000 Subject: [PATCH 274/864] Merged PR 29755: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230220.11 - **Date Produced**: February 21, 2023 2:20:19 AM UTC - **Commit**: 91af9ad334715d23c1382f71ccee9f45a501a70e - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23118.3 to 6.0.407-servicing.23120.11][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23118.3 to 6.0.407-servicing.23120.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b16338&targetVersion=GC91af9ad&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC0cf7050&targetVersion=GCb51b398&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 f6f29d76e..1357fac19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee6a74782..01c76cd8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b16338ed0bf771a31b2ecad1f7d342b94148615 + 91af9ad334715d23c1382f71ccee9f45a501a70e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b16338ed0bf771a31b2ecad1f7d342b94148615 + 91af9ad334715d23c1382f71ccee9f45a501a70e diff --git a/eng/Versions.props b/eng/Versions.props index 13723ff18..2b36b3b13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 0.2.0 - 6.0.407-servicing.23118.3 - 6.0.407-servicing.23118.3 + 6.0.407-servicing.23120.11 + 6.0.407-servicing.23120.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59eed2b64e59b5064e08dc15cd80b9c551fca499 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 19:27:41 +0000 Subject: [PATCH 275/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.16 -> To Version 7.0.300-preview.23121.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230220-01 -> To Version 17.6.0-preview-20230221-02 (parent: Microsoft.NET.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 1c471c337..ed6ae0fc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 diff --git a/eng/Versions.props b/eng/Versions.props index d94d82c30..25e36ad7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.4 - 7.0.300-preview.23121.4 - 7.0.300-preview.23121.4 + 7.0.300-preview.23121.7 + 7.0.300-preview.23121.7 + 7.0.300-preview.23121.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 19ccd58c041c99dfddfa62a80011d692eb66d796 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 20:54:58 +0000 Subject: [PATCH 276/864] Merged PR 29756: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230221.6 - **Date Produced**: February 21, 2023 6:40:51 PM UTC - **Commit**: 184bce99f0edbee2a6334f366c21980931bbed5f - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.310-servicing.23118.2 to 6.0.310-servicing.23121.6][1] - **Microsoft.NET.Sdk**: [from 6.0.310-servicing.23118.2 to 6.0.310-servicing.23121.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4f6a7f6&targetVersion=GC184bce9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC0cf7050&targetVersion=GCb51b398&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 95e86aeb4..ad8d3a8fe 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 a5fcc063d..edac2458b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 + 184bce99f0edbee2a6334f366c21980931bbed5f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f6a7f639f7921fcb8a7b11ff3b2718548f1f9c0 + 184bce99f0edbee2a6334f366c21980931bbed5f diff --git a/eng/Versions.props b/eng/Versions.props index 18e94929e..a634b03ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 0.2.0 - 6.0.310-servicing.23118.2 - 6.0.310-servicing.23118.2 + 6.0.310-servicing.23121.6 + 6.0.310-servicing.23121.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4946228186ef5cdcdd58cb5ecd5c168f6ede0bd4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 20:55:43 +0000 Subject: [PATCH 277/864] Merged PR 29723: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23073.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-3.23070.7 to 4.5.0-6.23109.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0-preview-23061-01 to 17.5.0 (par... --- NuGet.config | 38 ++---- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 50 ++++---- ...-Exclude-Analyzers-from-source-build.patch | 23 ---- 4 files changed, 97 insertions(+), 130 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/NuGet.config b/NuGet.config index daf27e784..19bd67321 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,22 @@ - - - + + + + + - - + - - - + - - - - - + @@ -49,24 +44,15 @@ - - - + - - + - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6711e9149..2adc73944 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cce692f665cbefe335ed33369897cea328d5fbcf + 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a09c7d17212981cb4fd5907fa6a6214966a366d + 0315841ebb89a21c717002224ad9d39f3c21320a https://github.com/dotnet/fsharp @@ -144,14 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 + 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 - + https://github.com/dotnet/msbuild - 040e2a90ee794997fc9716487280a54b0ad8fe2a + 81ac93548ee1044f03d0ac363712bb778920ef8c + + + https://github.com/dotnet/msbuild + 81ac93548ee1044f03d0ac363712bb778920ef8c @@ -163,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..106a8ef85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.3-servicing.23072.1 + 7.0.4-servicing.23117.7 - 7.0.3-servicing.23073.1 + 7.0.4-servicing.23117.7 @@ -50,46 +50,46 @@ - 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 + 7.0.4 + 7.0.4 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 0.2.0 - 7.0.200 - 7.0.200-rtm.23080.7 - 7.0.200-rtm.23080.7 + 7.0.201 + 7.0.201-rtm.23120.7 + 7.0.201-rtm.23120.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.1 - 7.0.3-servicing.23069.10 - 7.0.3-servicing.23069.10 - 7.0.3 - 7.0.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 + 7.0.4 + 7.0.4 + 7.0.4 + 7.0.4 2.1.0 - 7.0.3-servicing.23073.3 - 7.0.3-servicing.23073.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23118.3 + 7.0.4-servicing.23118.3 + 7.0.4 + 7.0.4 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.3 - 7.0.3 + 7.0.4 + 7.0.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch deleted file mode 100644 index 071ca05da..000000000 --- a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 16 Dec 2022 03:31:02 +0000 -Subject: [PATCH] Exclude Analyzers from source-build - -Backport: https://github.com/dotnet/razor/issues/8035 ---- - src/Compiler/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props -index e69a99bf3..f70902a08 100644 ---- a/src/Compiler/Directory.Build.props -+++ b/src/Compiler/Directory.Build.props -@@ -37,7 +37,7 @@ - $(WarningsNotAsErrors);xUnit1004 - - -- -+ - - - From 53beac08b4821a249b6da97b0a12ad10ff05eab4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 13:42:30 -0800 Subject: [PATCH 278/864] [main] Update dependencies from dotnet/arcade (#15596) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +-- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 135 ++++++++++++++---- eng/common/generate-locproject.ps1 | 9 +- eng/common/init-tools-native.ps1 | 9 +- eng/common/templates/job/job.yml | 6 +- .../templates/variables/pool-providers.yml | 6 +- global.json | 4 +- 8 files changed, 133 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2165068e..8ee048193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + c4a85adbff520f62bfade7a6132f471506c3d35a https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ e0402855655756b9562138b327763e1c97d0b908 - + https://github.com/dotnet/sourcelink - 763c618bbc4cc6481d37d122dc0dd3c2cafbcd49 + 955e79b0b955a9f57078b2399a782fcde44a9261 - + https://github.com/dotnet/xliff-tasks - 3cb4fa02ba389a7f070a16c50227cba2e610b48d + 69157952aba0f08738249af4454b045b553614c4 diff --git a/eng/Versions.props b/eng/Versions.props index 805d7d660..0044c3713 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23106.4 + 8.0.0-beta.23120.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 1ebf454f3..ffaa88eb0 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -6,10 +6,11 @@ usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" - echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo " for FreeBSD can be: freebsd12, freebsd13" - echo " for illumos can be: illumos" - echo " for Haiku can be: haiku." + echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" + echo " for alpine can be specified with version: alpineX.YY or alpineedge" + echo " for FreeBSD can be: freebsd12, freebsd13" + echo " for illumos can be: illumos" + echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." @@ -145,35 +146,54 @@ while :; do __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" fi ;; - ppc64le) - __BuildArch=ppc64le - __UbuntuArch=ppc64el - __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" - __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp5/}" - unset __LLDB_Package - ;; riscv64) __BuildArch=riscv64 + __AlpineArch=riscv64 + __AlpinePackages="${__AlpinePackages// lldb-dev/}" + __AlpinePackages="${__AlpinePackages// compiler-rt-static/}" + __QEMUArch=riscv64 __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" - __CodeName=sid __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" fi + + if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + fi + ;; + ppc64le) + __BuildArch=ppc64le + __AlpineArch=ppc64le + __QEMUArch=ppc64le + __UbuntuArch=ppc64el + __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" + __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp5/}" + unset __LLDB_Package + + if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then + __AlpineVersion=3.15 # minimum version that supports compiler-rt + fi ;; s390x) __BuildArch=s390x + __AlpineArch=s390x + __QEMUArch=s390x __UbuntuArch=s390x __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package + + if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then + __AlpineVersion=3.15 # minimum version that supports compiler-rt + fi ;; x64) __BuildArch=x64 @@ -252,22 +272,53 @@ while :; do __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" ;; + bullseye) # Debian 11 + __CodeName=bullseye + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; + sid) # Debian sid + __CodeName=sid + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; tizen) __CodeName= __UbuntuRepo= __Tizen=tizen ;; - alpine|alpine3.13) + alpine*) __CodeName=alpine __UbuntuRepo= - __AlpineVersion=3.13 - __AlpinePackages+=" llvm10-libs" - ;; - alpine3.14) - __CodeName=alpine - __UbuntuRepo= - __AlpineVersion=3.14 - __AlpinePackages+=" llvm11-libs" + version="${lowerI/alpine/}" + + if [[ "$version" == "edge" ]]; then + __AlpineVersion=edge + else + parts=(${version//./ }) + __AlpineMajorVersion="${parts[0]}" + __AlpineMinoVersion="${parts[1]}" + + if [[ -z "$__AlpineVersion" ]]; then + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" + fi + fi + + case "$__AlpineVersion" in + 3.14) __AlpinePackages+=" llvm11-libs" ;; + 3.15) __AlpinePackages+=" llvm12-libs" ;; + 3.16) __AlpinePackages+=" llvm13-libs" ;; + 3.17) __AlpinePackages+=" llvm15-libs" ;; + edge) __AlpineLlvmLibsLookup=1 ;; + *) + if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then + __AlpineVersion=3.15 # minimum version that supports compiler-rt + __AlpinePackages+=" llvm12-libs" + elif [[ "$__AlpineArch" == "riscv64" ]]; then + __AlpineLlvmLibsLookup=1 + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + else + __AlpineVersion=3.13 # 3.13 to maximize compatibility + fi + esac ;; freebsd12) __CodeName=freebsd @@ -341,18 +392,40 @@ mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then - __ApkToolsVersion=2.9.1 + __ApkToolsVersion=2.12.11 __ApkToolsDir="$(mktemp -d)" - wget "https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -P "$__ApkToolsDir" - tar -xf "$__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -C "$__ApkToolsDir" + + wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + chmod +x "$__ApkToolsDir/apk.static" + mkdir -p "$__RootfsDir"/usr/bin cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin" - "$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk" \ - -X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ - add $__AlpinePackages + if [[ "$__AlpineVersion" == "edge" ]]; then + version=edge + else + version="v$__AlpineVersion" + fi + + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ + add $__AlpinePackages + + if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + add "$name-libs" + done + fi rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bcb579e37..524aaa57f 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -45,7 +45,7 @@ if (-not $wxlFiles) { } } -$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files $macosHtmlFiles = @() if ($macosHtmlEnFiles) { $macosHtmlEnFiles | ForEach-Object { @@ -148,12 +148,17 @@ $locJson = @{ } } $sourceFile = ($_.FullName | Resolve-Path -Relative) + $lciFile = $sourceFile + ".lci" if ($continue) { - return @{ + $result = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath } + if (Test-Path $lciFile -PathType Leaf) { + $result["LciFile"] = $lciFile + } + return $result } } ) diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index fbc67effc..27ccdb9ec 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -83,7 +83,8 @@ try { Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { if ($PathPromotion -eq $True) { - if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" + if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value @@ -93,11 +94,6 @@ try { if ($ToolVersion -eq "latest") { $ToolVersion = "" } - $ArcadeToolsDirectory = "C:\arcade-tools" - if (-not (Test-Path $ArcadeToolsDirectory)) { - Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." - exit 1 - } $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." @@ -125,6 +121,7 @@ try { if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." } } exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index f0af425d9..61914a1fb 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,7 +134,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 inputs: buildType: current @@ -171,7 +171,7 @@ jobs: TeamName: $(_TeamName) - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - task: CopyFiles@2 displayName: Gather binaries for publish to artifacts inputs: @@ -192,7 +192,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - publish: artifacts/log artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} displayName: Publish logs diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 99c80212b..9cc5c550d 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,17 +1,17 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# 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) +# (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. +# If we find alternate naming conventions in broad usage it can be added to the condition below. # # First, import the template in an arcade-ified repo to pick up the variables, e.g.: # diff --git a/global.json b/global.json index 669d24dbf..e48079a73 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23106.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23106.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23120.1" } } From 8616a1d236a580406389cec4e23a72fb7d206849 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 21 Feb 2023 16:44:46 -0500 Subject: [PATCH 279/864] [release/6.0.1xx] Arm support (#13378) --- Directory.Build.props | 2 +- Native.sln | 6 ++++++ eng/Build.props | 2 +- src/SourceBuild/tarball/content/Directory.Build.props | 2 +- src/SourceBuild/tarball/content/repos/known-good.proj | 3 ++- src/SourceBuild/tarball/content/repos/runtime.common.props | 2 +- src/SourceBuild/tarball/content/tools-local/init-build.proj | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c373c9beb..e1ad6e446 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,7 +9,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - $(BuildArchitecture) + $(BuildArchitecture) $(BuildArchitecture) x64 diff --git a/Native.sln b/Native.sln index 7ce79b609..a4ffcf64d 100644 --- a/Native.sln +++ b/Native.sln @@ -11,9 +11,11 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 Debug|x64 = Debug|x64 + Debug|arm = Debug|arm Debug|arm64 = Debug|arm64 Release|x86 = Release|x86 Release|x64 = Release|x64 + Release|arm = Release|arm Release|arm64 = Release|arm64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -21,12 +23,16 @@ Global {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x86.Build.0 = Debug|x86 {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x64.ActiveCfg = Debug|x64 {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x64.Build.0 = Debug|x64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm.ActiveCfg = Debug|arm + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm.Build.0 = Debug|arm {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm64.ActiveCfg = Debug|arm64 {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm64.Build.0 = Debug|arm64 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x86.ActiveCfg = Release|x86 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x86.Build.0 = Release|x86 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x64.ActiveCfg = Release|x64 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x64.Build.0 = Release|x64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm.ActiveCfg = Release|arm + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm.Build.0 = Release|arm {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm64.ActiveCfg = Release|arm64 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm64.Build.0 = Release|arm64 EndGlobalSection diff --git a/eng/Build.props b/eng/Build.props index 4df683bab..85e7bc70e 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,7 +1,7 @@ - diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 61cc6ff67..797e54fa6 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -17,7 +17,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - $(BuildArchitecture) + $(BuildArchitecture) $(BuildArchitecture) x64 diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index eab516290..bfb12508e 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -18,7 +18,8 @@ - + + diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props index b1e9e6adb..037c3d94a 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.common.props +++ b/src/SourceBuild/tarball/content/repos/runtime.common.props @@ -13,7 +13,7 @@ $(StandardSourceBuildArgs.Replace('-bl', '-nobl')) $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs) + $(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs) $(ProjectDirectory)/clean$(ShellExtension) diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 701f76c0c..b2c3beed1 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -138,7 +138,7 @@ - + From afa377dd222a1ebb6aefd8ca82631b0d85eca7e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Feb 2023 02:51:09 +0000 Subject: [PATCH 280/864] Merged PR 29761: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230221.9 - **Date Produced**: February 22, 2023 1:15:48 AM UTC - **Commit**: 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23120.6 to 7.0.104-servicing.23121.9][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23120.6 to 7.0.104-servicing.23121.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23120.6 to 7.0.104-servicing.23121.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0bd9efc&targetVersion=GC50c5629&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ed66021a..074474e4c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54a99923d..129c2815d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bd9efc90be8a0219f562515a2d42527b6d84c50 + 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bd9efc90be8a0219f562515a2d42527b6d84c50 + 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bd9efc90be8a0219f562515a2d42527b6d84c50 + 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bd9efc90be8a0219f562515a2d42527b6d84c50 + 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 diff --git a/eng/Versions.props b/eng/Versions.props index 80bade6bd..865d0be93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23120.6 - 7.0.104-servicing.23120.6 + 7.0.104-servicing.23121.9 + 7.0.104-servicing.23121.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 03ae823c308304c4a374502a328ba741373e761f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 03:11:01 +0000 Subject: [PATCH 281/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23120.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed62f812c..dd1b31320 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 998b5101ac37f8f5cf913334006429cf71d1dded + 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 - + https://github.com/dotnet/windowsdesktop - 998b5101ac37f8f5cf913334006429cf71d1dded + 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 - + https://github.com/dotnet/windowsdesktop - 998b5101ac37f8f5cf913334006429cf71d1dded + 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 - + https://github.com/dotnet/windowsdesktop - 998b5101ac37f8f5cf913334006429cf71d1dded + 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab https://github.com/dotnet/aspnetcore @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1c3c95edfbd68bc0aff05d9c16bee25a24179dba + 1edf231a246d059aa60b810c387db0d6f1e19598 - + https://github.com/dotnet/sdk - 1c3c95edfbd68bc0aff05d9c16bee25a24179dba + 1edf231a246d059aa60b810c387db0d6f1e19598 - + https://github.com/dotnet/sdk - 1c3c95edfbd68bc0aff05d9c16bee25a24179dba + 1edf231a246d059aa60b810c387db0d6f1e19598 - + https://github.com/dotnet/sdk - 1c3c95edfbd68bc0aff05d9c16bee25a24179dba + 1edf231a246d059aa60b810c387db0d6f1e19598 - + https://github.com/dotnet/winforms - 5b971a53cbb1afe38cf990416bea69a5bcbb5d2a + e054841c9c2f3bc4ca4d4ae71835f16e434371ce - + https://github.com/dotnet/wpf - 1d302568334aff201ec825827b135c22787c73b7 + 4714ebec27b262d125bca2233e1b7954da83ff87 https://github.com/dotnet/fsharp @@ -142,18 +142,18 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - a0d28f4838a3075d3080c9ff5690e26969cbe67f + 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/roslyn - 73338d92270b9f26982eca2e8872037a0214b912 + e728efff2fe94c2614dd53ae4bd428cb4187753e - + https://github.com/dotnet/msbuild - 5476e4396fdcec6e3578ba595082f18f2130ca21 + 02c4162874fb061081978f49295c3c3cee25978a diff --git a/eng/Versions.props b/eng/Versions.props index ad68c16eb..cab8186e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23117.6 + 8.0.0-preview.2.23119.3 - 8.0.0-preview.2.23117.8 + 8.0.0-preview.2.23120.2 @@ -71,33 +71,33 @@ - 8.0.100-preview.2.23121.5 - 8.0.100-preview.2.23121.5 - 8.0.100-preview.2.23121.5 + 8.0.100-preview.2.23121.11 + 8.0.100-preview.2.23121.11 + 8.0.100-preview.2.23121.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.6 - 8.0.0-preview.2.23120.5 - 8.0.0-preview.2.23120.5 - 8.0.0-preview.2.23120.5 - 8.0.0-preview.2.23120.5 - 8.0.0-preview.2.23120.5 - 8.0.0-preview.2.23120.5 + 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23120.6 2.1.0 - 8.0.0-preview.2.23119.1 - 8.0.0-preview.2.23119.1 - 8.0.0-preview.2.23119.1 - 8.0.0-preview.2.23119.1 + 8.0.0-preview.2.23120.1 + 8.0.0-preview.2.23120.1 + 8.0.0-preview.2.23120.1 + 8.0.0-preview.2.23120.1 From 41c01dc860b00c4f4e3ac96ded63e95263c71abe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 03:28:00 +0000 Subject: [PATCH 282/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.7 -> To Version 7.0.300-preview.23121.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 7.0.100-1.23115.1 -> To Version 7.0.100-1.23121.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 ed6ae0fc5..f419e88d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b @@ -138,15 +138,15 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/linker - 757da5c5adf9a6a9732285ccace1abf136be1370 + b516999ab57ce68da016b68cc2a09e2c15208e68 linker - + https://github.com/dotnet/roslyn - 73338d92270b9f26982eca2e8872037a0214b912 + e728efff2fe94c2614dd53ae4bd428cb4187753e diff --git a/eng/Versions.props b/eng/Versions.props index 25e36ad7c..54f6dc00f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.7 - 7.0.300-preview.23121.7 - 7.0.300-preview.23121.7 + 7.0.300-preview.23121.10 + 7.0.300-preview.23121.10 + 7.0.300-preview.23121.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fa6b35a4caf8db6e9f58080c385c44330fd29404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 04:10:22 +0000 Subject: [PATCH 283/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23120.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd1b31320..c707e435e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 - + https://github.com/dotnet/aspnetcore - d1e184bef07ff58d9c093403d583a296d2e73c1c + 86e3a4bc2d85794b6470539ddd29b9d3e194f546 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1edf231a246d059aa60b810c387db0d6f1e19598 + d74ee3393e8f04d83da5304a88fce6a83999f13e - + https://github.com/dotnet/sdk - 1edf231a246d059aa60b810c387db0d6f1e19598 + d74ee3393e8f04d83da5304a88fce6a83999f13e - + https://github.com/dotnet/sdk - 1edf231a246d059aa60b810c387db0d6f1e19598 + d74ee3393e8f04d83da5304a88fce6a83999f13e - + https://github.com/dotnet/sdk - 1edf231a246d059aa60b810c387db0d6f1e19598 + d74ee3393e8f04d83da5304a88fce6a83999f13e diff --git a/eng/Versions.props b/eng/Versions.props index cab8186e6..e47a02b68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23120.8 - 8.0.0-preview.2.23120.8 - 8.0.0-preview.2.23120.8 - 8.0.0-preview.2.23120.8 - 8.0.0-preview.2.23120.8 - 8.0.0-preview.2.23120.8 - 8.0.0-preview.2.23120.8 + 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23121.4 0.2.0 - 8.0.100-preview.2.23121.11 - 8.0.100-preview.2.23121.11 - 8.0.100-preview.2.23121.11 + 8.0.100-preview.2.23121.12 + 8.0.100-preview.2.23121.12 + 8.0.100-preview.2.23121.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0090ed02cf370cc7933b11c7980375c9a387a8a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 05:01:06 +0000 Subject: [PATCH 284/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23120.1 (parent: Microsoft.NET.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 c707e435e..6fa8af4da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d74ee3393e8f04d83da5304a88fce6a83999f13e + c1a382a99d6110e06b01488b00d54c9596244a26 - + https://github.com/dotnet/sdk - d74ee3393e8f04d83da5304a88fce6a83999f13e + c1a382a99d6110e06b01488b00d54c9596244a26 - + https://github.com/dotnet/sdk - d74ee3393e8f04d83da5304a88fce6a83999f13e + c1a382a99d6110e06b01488b00d54c9596244a26 - + https://github.com/dotnet/sdk - d74ee3393e8f04d83da5304a88fce6a83999f13e + c1a382a99d6110e06b01488b00d54c9596244a26 diff --git a/eng/Versions.props b/eng/Versions.props index e47a02b68..4fe99410b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23121.12 - 8.0.100-preview.2.23121.12 - 8.0.100-preview.2.23121.12 + 8.0.100-preview.2.23121.13 + 8.0.100-preview.2.23121.13 + 8.0.100-preview.2.23121.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1a41ac8e68579b1c372c9dbe8eb4a164c975d585 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 06:56:04 +0000 Subject: [PATCH 285/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23121.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23121.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fa8af4da..5686cedf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 + c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf - + https://github.com/dotnet/windowsdesktop - 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 + c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf - + https://github.com/dotnet/windowsdesktop - 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 + c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf - + https://github.com/dotnet/windowsdesktop - 4c9e1f59894f44b11438c0231ef0eaadaf9326f6 + c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf https://github.com/dotnet/runtime @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c1a382a99d6110e06b01488b00d54c9596244a26 + 5225a61111886da97e6619f4ff9ed5433d622448 - + https://github.com/dotnet/sdk - c1a382a99d6110e06b01488b00d54c9596244a26 + 5225a61111886da97e6619f4ff9ed5433d622448 - + https://github.com/dotnet/sdk - c1a382a99d6110e06b01488b00d54c9596244a26 + 5225a61111886da97e6619f4ff9ed5433d622448 - + https://github.com/dotnet/sdk - c1a382a99d6110e06b01488b00d54c9596244a26 + 5225a61111886da97e6619f4ff9ed5433d622448 diff --git a/eng/Versions.props b/eng/Versions.props index 4fe99410b..358997d4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23121.13 - 8.0.100-preview.2.23121.13 - 8.0.100-preview.2.23121.13 + 8.0.100-preview.2.23121.15 + 8.0.100-preview.2.23121.15 + 8.0.100-preview.2.23121.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.2.23120.1 - 8.0.0-preview.2.23120.1 - 8.0.0-preview.2.23120.1 - 8.0.0-preview.2.23120.1 + 8.0.0-preview.2.23121.1 + 8.0.0-preview.2.23121.1 + 8.0.0-preview.2.23121.1 + 8.0.0-preview.2.23121.1 From d56895f92fb4c63b2371ad75180faf4c717e1c07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 07:09:36 +0000 Subject: [PATCH 286/864] Update dependencies from https://github.com/dotnet/sdk build 20230221.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.10 -> To Version 7.0.300-preview.23121.14 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23121-03 -> To Version 17.6.0-preview-23122-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 f419e88d4..143aad28f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba @@ -149,9 +149,9 @@ e728efff2fe94c2614dd53ae4bd428cb4187753e - + https://github.com/dotnet/msbuild - 02c4162874fb061081978f49295c3c3cee25978a + 4b5e303b3646131dfbaf425c21021f5233cece8e diff --git a/eng/Versions.props b/eng/Versions.props index 54f6dc00f..ce2acadc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.10 - 7.0.300-preview.23121.10 - 7.0.300-preview.23121.10 + 7.0.300-preview.23121.14 + 7.0.300-preview.23121.14 + 7.0.300-preview.23121.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd602d32cb3f944022d827414590fb14203b6cbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 13:26:53 +0000 Subject: [PATCH 287/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230221.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23116.1 -> To Version 8.0.0-alpha.1.23121.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4436e7cc9..06bec8aa6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,9 +183,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 89bdfc9cc4ceea68fa9113cace36ba7ba401f34e + 616f121630a3c46bff2cd7f50640f051f446070d From 8c707b39c7243986d31e256d013195970499c9b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 14:52:42 +0000 Subject: [PATCH 288/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23122.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23121.1 (parent: Microsoft.NET.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 5686cedf2..b460ee03c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5225a61111886da97e6619f4ff9ed5433d622448 + 72e41632e3170830f008049f88765923459d2dfc - + https://github.com/dotnet/sdk - 5225a61111886da97e6619f4ff9ed5433d622448 + 72e41632e3170830f008049f88765923459d2dfc - + https://github.com/dotnet/sdk - 5225a61111886da97e6619f4ff9ed5433d622448 + 72e41632e3170830f008049f88765923459d2dfc - + https://github.com/dotnet/sdk - 5225a61111886da97e6619f4ff9ed5433d622448 + 72e41632e3170830f008049f88765923459d2dfc diff --git a/eng/Versions.props b/eng/Versions.props index 358997d4d..2591e9f7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23121.15 - 8.0.100-preview.2.23121.15 - 8.0.100-preview.2.23121.15 + 8.0.100-preview.2.23122.1 + 8.0.100-preview.2.23122.1 + 8.0.100-preview.2.23122.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 471e08c58851bfe7139b9588ff31dcaeb83028c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 15:18:08 +0000 Subject: [PATCH 289/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230222.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23121.2 -> To Version 8.0.0-alpha.1.23122.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4436e7cc9..c0eb3b2f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 0fc024c4bae28eb8e119df056efa9606bb61bb53 + ae16ce53ff9e2e7b8f5c38082bd15b72fe4ad57f From 9a9449b5986063724696550e5e0ee82a34d9b025 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 22 Feb 2023 16:52:28 +0100 Subject: [PATCH 290/864] tests: ExecuteRunWeb: update expected SIGTERM exit code on mono. (#15341) Co-authored-by: Michael Simons --- .../DotNetHelper.cs | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index 921ab1f97..ff1071e2e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -14,6 +14,7 @@ internal class DotNetHelper { private static readonly object s_lockObj = new(); + private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime(); public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet"); public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages"); @@ -198,10 +199,13 @@ internal class DotNetHelper public void ExecuteRunWeb(string projectName) { + // 'dotnet run' exit code differs between CoreCLR and Mono (https://github.com/dotnet/sdk/issues/30095). + int expectedExitCode = IsMonoRuntime ? 143 : 0; ExecuteCmd( $"run {GetBinLogOption(projectName, "run")}", GetProjectDirectory(projectName), additionalProcessConfigCallback: processConfigCallback, + expectedExitCode, millisecondTimeout: 30000); void processConfigCallback(Process process) @@ -230,5 +234,27 @@ internal class DotNetHelper return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}"; } + private static bool DetermineIsMonoRuntime() + { + string dotnetRoot = Config.DotNetDirectory; + + string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App"); + if (!Directory.Exists(sharedFrameworkRoot)) + { + return false; + } + + string? version = Directory.GetDirectories(sharedFrameworkRoot).FirstOrDefault(); + if (version is null) + { + return false; + } + + string sharedFramework = Path.Combine(sharedFrameworkRoot, version); + + // Check the presence of one of the mono header files. + return File.Exists(Path.Combine(sharedFramework, "mono-gc.h")); + } + private static string GetProjectDirectory(string projectName) => Path.Combine(ProjectsDirectory, projectName); } From 3d7a3d235319665fef45fa177fb358b24c88e187 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 17:11:32 +0000 Subject: [PATCH 291/864] Update dependencies from https://github.com/dotnet/arcade build 20230217.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23117.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 143aad28f..9ae23bc6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ce2acadc3..e8d2af96e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23114.3 + 7.0.0-beta.23117.3 diff --git a/global.json b/global.json index 5039463a8..dfd6be6d5 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" } } From f868f35234f6a0d9b1a3676897890ab6c118fede Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 17:11:35 +0000 Subject: [PATCH 292/864] Update dependencies from https://github.com/dotnet/arcade build 20230217.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23117.3 --- NuGet.config | 26 -------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index daf27e784..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,14 @@ - - - - - - - - - - - - - @@ -49,24 +36,11 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6711e9149..2e8a65610 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..537c5a15b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23114.3 + 7.0.0-beta.23117.3 diff --git a/global.json b/global.json index 5039463a8..dfd6be6d5 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" } } From bfef7d94914e7104fac246d0ec687f6aa5fa7475 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 22 Feb 2023 11:23:35 -0600 Subject: [PATCH 293/864] Add cecil to SB repos (#15607) --- src/SourceBuild/content/repo-projects/cecil.proj | 13 +++++++++++++ src/SourceBuild/content/repo-projects/runtime.proj | 1 + 2 files changed, 14 insertions(+) create mode 100644 src/SourceBuild/content/repo-projects/cecil.proj diff --git a/src/SourceBuild/content/repo-projects/cecil.proj b/src/SourceBuild/content/repo-projects/cecil.proj new file mode 100644 index 000000000..25ce5aa77 --- /dev/null +++ b/src/SourceBuild/content/repo-projects/cecil.proj @@ -0,0 +1,13 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index d3058b5a5..7638bc189 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -49,6 +49,7 @@ + From c31377d958f3fae9bc322bae2976a0c38d50aa68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 18:07:29 +0000 Subject: [PATCH 294/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23122.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23121.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++--------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b460ee03c..9832efd67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf + a4b64ef7ac62fb4505108a2442f72bcecdb402df - + https://github.com/dotnet/windowsdesktop - c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf + a4b64ef7ac62fb4505108a2442f72bcecdb402df - + https://github.com/dotnet/windowsdesktop - c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf + a4b64ef7ac62fb4505108a2442f72bcecdb402df - + https://github.com/dotnet/windowsdesktop - c7f9efa5cdcbac6d5d8659d643b0fcb04e873ccf + a4b64ef7ac62fb4505108a2442f72bcecdb402df https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 - + https://github.com/dotnet/aspnetcore - 86e3a4bc2d85794b6470539ddd29b9d3e194f546 + f3836ae4b6d4ea9895745ac18af19331b4b58af5 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 72e41632e3170830f008049f88765923459d2dfc + 1aae1b828ed869afd3e164509c7af97a8a6f6517 - + https://github.com/dotnet/sdk - 72e41632e3170830f008049f88765923459d2dfc + 1aae1b828ed869afd3e164509c7af97a8a6f6517 - + https://github.com/dotnet/sdk - 72e41632e3170830f008049f88765923459d2dfc + 1aae1b828ed869afd3e164509c7af97a8a6f6517 - + https://github.com/dotnet/sdk - 72e41632e3170830f008049f88765923459d2dfc + 1aae1b828ed869afd3e164509c7af97a8a6f6517 https://github.com/dotnet/winforms e054841c9c2f3bc4ca4d4ae71835f16e434371ce - + https://github.com/dotnet/wpf - 4714ebec27b262d125bca2233e1b7954da83ff87 + edd97c9f6c5b81c7d40c358a6663c7d029f8a67d https://github.com/dotnet/fsharp @@ -151,9 +151,9 @@ e728efff2fe94c2614dd53ae4bd428cb4187753e - + https://github.com/dotnet/msbuild - 02c4162874fb061081978f49295c3c3cee25978a + 4b5e303b3646131dfbaf425c21021f5233cece8e diff --git a/eng/Versions.props b/eng/Versions.props index 2591e9f7c..2d82d2ebe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 8.0.0-preview.2.23120.2 + 8.0.0-preview.2.23121.1 @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23121.4 - 8.0.0-preview.2.23121.4 - 8.0.0-preview.2.23121.4 - 8.0.0-preview.2.23121.4 - 8.0.0-preview.2.23121.4 - 8.0.0-preview.2.23121.4 - 8.0.0-preview.2.23121.4 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 0.2.0 - 8.0.100-preview.2.23122.1 - 8.0.100-preview.2.23122.1 - 8.0.100-preview.2.23122.1 + 8.0.100-preview.2.23122.2 + 8.0.100-preview.2.23122.2 + 8.0.100-preview.2.23122.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.2.23121.1 - 8.0.0-preview.2.23121.1 - 8.0.0-preview.2.23121.1 - 8.0.0-preview.2.23121.1 + 8.0.0-preview.2.23121.2 + 8.0.0-preview.2.23121.2 + 8.0.0-preview.2.23121.2 + 8.0.0-preview.2.23121.2 From df0fc12896801849d0ad6798f710a78264cb896e Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 22 Feb 2023 13:51:32 -0500 Subject: [PATCH 295/864] Add Alpine CI for source-build (#14417) Co-authored-by: Michael Simons --- .../templates/job/source-build-run-tarball-build.yml | 8 ++++++++ .../eng/bootstrap/buildBootstrapPreviouslySB.csproj | 4 ++++ 2 files changed, 12 insertions(+) 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 efa1ff1af..f031aaf23 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 @@ -9,6 +9,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-20230214152931-7f13c75 centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8-20220812185233-b286fae @@ -50,6 +51,13 @@ jobs: _RunOnline: false _WithPreviousSDK: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false CentOSStream8-WithPreviousSDK: _BootstrapPrep: false _Container: ${{ parameters.centOSStream8Container }} diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 256cde2a2..f8fb96aa2 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -15,9 +15,13 @@ + + + + From ae75704d56239f392780a7bfeff62d40bc39a684 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 19:05:08 +0000 Subject: [PATCH 296/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23122.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23121.2 (parent: Microsoft.NET.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 9832efd67..1017cdb83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1aae1b828ed869afd3e164509c7af97a8a6f6517 + 45a14239002eb0a6f8ea6096d756d882a0cb8208 - + https://github.com/dotnet/sdk - 1aae1b828ed869afd3e164509c7af97a8a6f6517 + 45a14239002eb0a6f8ea6096d756d882a0cb8208 - + https://github.com/dotnet/sdk - 1aae1b828ed869afd3e164509c7af97a8a6f6517 + 45a14239002eb0a6f8ea6096d756d882a0cb8208 - + https://github.com/dotnet/sdk - 1aae1b828ed869afd3e164509c7af97a8a6f6517 + 45a14239002eb0a6f8ea6096d756d882a0cb8208 diff --git a/eng/Versions.props b/eng/Versions.props index 2d82d2ebe..64d509e8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23122.2 - 8.0.100-preview.2.23122.2 - 8.0.100-preview.2.23122.2 + 8.0.100-preview.2.23122.3 + 8.0.100-preview.2.23122.3 + 8.0.100-preview.2.23122.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b983d692ca78c091bc6d3399dc1a4e0d329db45f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 22:20:36 +0000 Subject: [PATCH 297/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230222.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23122.1 -> To Version 8.0.0-alpha.1.23122.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3f4af43b..b0c88bea3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - ae16ce53ff9e2e7b8f5c38082bd15b72fe4ad57f + abf867508a6c495f28afe610fa56e5767b1c3ff7 From 9fe0829624d9b22b69f7373a9b50611c9eeedf3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 04:56:38 +0000 Subject: [PATCH 298/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.14 -> To Version 7.0.300-preview.23122.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-2.23121.6 -> To Version 4.6.0-2.23122.3 (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 9ae23bc6c..38043c9c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae - + https://github.com/dotnet/sdk - 106807e7fe11f4f7f5fee31bc3fe0218248d16ba + ff59f5dc32c377243e40620a7a3091f9270a15ae @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 diff --git a/eng/Versions.props b/eng/Versions.props index e8d2af96e..e5bfe99c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.14 - 7.0.300-preview.23121.14 - 7.0.300-preview.23121.14 + 7.0.300-preview.23122.5 + 7.0.300-preview.23122.5 + 7.0.300-preview.23122.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a296d1ea4e038425193d597eb1cf23d15754337b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 05:20:38 +0000 Subject: [PATCH 299/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23122.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23121.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1017cdb83..9f9fd580f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e - + https://github.com/dotnet/aspnetcore - f3836ae4b6d4ea9895745ac18af19331b4b58af5 + 3119c78f9716199884988b567fa9dcbcecf4b35e https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 45a14239002eb0a6f8ea6096d756d882a0cb8208 + 571d48c039a15ab085156cc2d18412aba7638639 - + https://github.com/dotnet/sdk - 45a14239002eb0a6f8ea6096d756d882a0cb8208 + 571d48c039a15ab085156cc2d18412aba7638639 - + https://github.com/dotnet/sdk - 45a14239002eb0a6f8ea6096d756d882a0cb8208 + 571d48c039a15ab085156cc2d18412aba7638639 - + https://github.com/dotnet/sdk - 45a14239002eb0a6f8ea6096d756d882a0cb8208 + 571d48c039a15ab085156cc2d18412aba7638639 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 75eac9643f3d8952df3cffd928e7987887bb7dab - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 7347efa598bc5e34086f6c1078f1c0e864400d29 diff --git a/eng/Versions.props b/eng/Versions.props index 64d509e8c..6e630766e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.4 0.2.0 - 8.0.100-preview.2.23122.3 - 8.0.100-preview.2.23122.3 - 8.0.100-preview.2.23122.3 + 8.0.100-preview.2.23122.6 + 8.0.100-preview.2.23122.6 + 8.0.100-preview.2.23122.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24930165c292fa4a5d499d811e015ee2af6a53a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 06:14:28 +0000 Subject: [PATCH 300/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.14 -> To Version 7.0.300-preview.23122.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23114.3 -> To Version 12.5.0-beta.23122.4 (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 38043c9c2..be87684dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b - + https://github.com/dotnet/sdk - ff59f5dc32c377243e40620a7a3091f9270a15ae + 1cdb9e6024885766c67b3513db7f9ccd54bb378b @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e diff --git a/eng/Versions.props b/eng/Versions.props index e5bfe99c4..b742fb533 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23122.5 - 7.0.300-preview.23122.5 - 7.0.300-preview.23122.5 + 7.0.300-preview.23122.7 + 7.0.300-preview.23122.7 + 7.0.300-preview.23122.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3329e6c25bfd578b93652c0f97dd4bf40065027c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 07:08:45 +0000 Subject: [PATCH 301/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23122.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f9fd580f..aa87358b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - a4b64ef7ac62fb4505108a2442f72bcecdb402df + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/windowsdesktop - a4b64ef7ac62fb4505108a2442f72bcecdb402df + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/windowsdesktop - a4b64ef7ac62fb4505108a2442f72bcecdb402df + 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/windowsdesktop - a4b64ef7ac62fb4505108a2442f72bcecdb402df + 7514f9bc0755cdb942b1426c99e57abb129f6f43 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 571d48c039a15ab085156cc2d18412aba7638639 + e66e6846c83b6bc801b7388c02b2e6845ecd7500 - + https://github.com/dotnet/sdk - 571d48c039a15ab085156cc2d18412aba7638639 + e66e6846c83b6bc801b7388c02b2e6845ecd7500 - + https://github.com/dotnet/sdk - 571d48c039a15ab085156cc2d18412aba7638639 + e66e6846c83b6bc801b7388c02b2e6845ecd7500 - + https://github.com/dotnet/sdk - 571d48c039a15ab085156cc2d18412aba7638639 + e66e6846c83b6bc801b7388c02b2e6845ecd7500 - + https://github.com/dotnet/winforms - e054841c9c2f3bc4ca4d4ae71835f16e434371ce + 46195b1c4ad995a32046cbeeeb8d650550685c28 - + https://github.com/dotnet/wpf - edd97c9f6c5b81c7d40c358a6663c7d029f8a67d + c37ab558d3aebf3bfe0038c86e8a4be78d09e03c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6e630766e..a9640ecb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23119.3 + 8.0.0-preview.2.23121.7 - 8.0.0-preview.2.23121.1 + 8.0.0-preview.2.23121.2 @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23122.6 - 8.0.100-preview.2.23122.6 - 8.0.100-preview.2.23122.6 + 8.0.100-preview.2.23122.8 + 8.0.100-preview.2.23122.8 + 8.0.100-preview.2.23122.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.2.23121.2 - 8.0.0-preview.2.23121.2 - 8.0.0-preview.2.23121.2 - 8.0.0-preview.2.23121.2 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23122.1 From c2e4bd96b0fad0a1fca5b4a90c4a492cb1bc08aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 07:28:18 +0000 Subject: [PATCH 302/864] Update dependencies from https://github.com/dotnet/sdk build 20230222.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23122.7 -> To Version 7.0.300-preview.23122.9 --- 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 be87684dc..9538c1e7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 - + https://github.com/dotnet/sdk - 1cdb9e6024885766c67b3513db7f9ccd54bb378b + b99d91865c9af282470a55ff4ba938ffe2a8caa1 diff --git a/eng/Versions.props b/eng/Versions.props index b742fb533..8b0b6c0b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23122.7 - 7.0.300-preview.23122.7 - 7.0.300-preview.23122.7 + 7.0.300-preview.23122.9 + 7.0.300-preview.23122.9 + 7.0.300-preview.23122.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e2d2e795a4f39632e8bcec0955338bab7f0ab2e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 09:21:41 +0000 Subject: [PATCH 303/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23122.9 -> To Version 7.0.300-preview.23123.1 --- 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 9538c1e7f..92935a8de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 - + https://github.com/dotnet/sdk - b99d91865c9af282470a55ff4ba938ffe2a8caa1 + 854826d569ad743a0d55fde44a7d642e5d646745 diff --git a/eng/Versions.props b/eng/Versions.props index 8b0b6c0b7..2b20c7459 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23122.9 - 7.0.300-preview.23122.9 - 7.0.300-preview.23122.9 + 7.0.300-preview.23123.1 + 7.0.300-preview.23123.1 + 7.0.300-preview.23123.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ed1b16e870a0b3b7fb81b4a6466004494e325ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 10:06:25 +0000 Subject: [PATCH 304/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23123.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (parent: Microsoft.NET.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 aa87358b9..e5a33576e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e66e6846c83b6bc801b7388c02b2e6845ecd7500 + 3ebe96215b476a2d43a0938205d688c8def2a72b - + https://github.com/dotnet/sdk - e66e6846c83b6bc801b7388c02b2e6845ecd7500 + 3ebe96215b476a2d43a0938205d688c8def2a72b - + https://github.com/dotnet/sdk - e66e6846c83b6bc801b7388c02b2e6845ecd7500 + 3ebe96215b476a2d43a0938205d688c8def2a72b - + https://github.com/dotnet/sdk - e66e6846c83b6bc801b7388c02b2e6845ecd7500 + 3ebe96215b476a2d43a0938205d688c8def2a72b diff --git a/eng/Versions.props b/eng/Versions.props index a9640ecb8..2f142c029 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23122.8 - 8.0.100-preview.2.23122.8 - 8.0.100-preview.2.23122.8 + 8.0.100-preview.2.23123.2 + 8.0.100-preview.2.23123.2 + 8.0.100-preview.2.23123.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f569ddb42116440af8e526c6d567a893dedb139 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 11:04:41 +0000 Subject: [PATCH 305/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23123.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5a33576e..bde3c4f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3ebe96215b476a2d43a0938205d688c8def2a72b + c68ab706dc5d50a7603ba39544da5663baad219f - + https://github.com/dotnet/sdk - 3ebe96215b476a2d43a0938205d688c8def2a72b + c68ab706dc5d50a7603ba39544da5663baad219f - + https://github.com/dotnet/sdk - 3ebe96215b476a2d43a0938205d688c8def2a72b + c68ab706dc5d50a7603ba39544da5663baad219f - + https://github.com/dotnet/sdk - 3ebe96215b476a2d43a0938205d688c8def2a72b + c68ab706dc5d50a7603ba39544da5663baad219f @@ -142,9 +142,9 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - 75eac9643f3d8952df3cffd928e7987887bb7dab + 3adabbcf308556bd0506c2dc3d82a022c8751456 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2f142c029..e1daa80aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23123.2 - 8.0.100-preview.2.23123.2 - 8.0.100-preview.2.23123.2 + 8.0.100-preview.2.23123.3 + 8.0.100-preview.2.23123.3 + 8.0.100-preview.2.23123.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23120.6 - 8.0.0-preview.2.23120.6 - 8.0.0-preview.2.23120.6 - 8.0.0-preview.2.23120.6 - 8.0.0-preview.2.23120.6 - 8.0.0-preview.2.23120.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 2.1.0 From 73d42a6d519fe37ab990f5408dde1cfcd57fddd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 12:04:29 +0000 Subject: [PATCH 306/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23123.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bde3c4f92..e123412c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/aspnetcore - 3119c78f9716199884988b567fa9dcbcecf4b35e + ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c68ab706dc5d50a7603ba39544da5663baad219f + 0338c0af8beed93e2e2c277b3119fb340c9b3f57 - + https://github.com/dotnet/sdk - c68ab706dc5d50a7603ba39544da5663baad219f + 0338c0af8beed93e2e2c277b3119fb340c9b3f57 - + https://github.com/dotnet/sdk - c68ab706dc5d50a7603ba39544da5663baad219f + 0338c0af8beed93e2e2c277b3119fb340c9b3f57 - + https://github.com/dotnet/sdk - c68ab706dc5d50a7603ba39544da5663baad219f + 0338c0af8beed93e2e2c277b3119fb340c9b3f57 diff --git a/eng/Versions.props b/eng/Versions.props index e1daa80aa..7aa95c5e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23122.4 - 8.0.0-preview.2.23122.4 - 8.0.0-preview.2.23122.4 - 8.0.0-preview.2.23122.4 - 8.0.0-preview.2.23122.4 - 8.0.0-preview.2.23122.4 - 8.0.0-preview.2.23122.4 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23122.6 0.2.0 - 8.0.100-preview.2.23123.3 - 8.0.100-preview.2.23123.3 - 8.0.100-preview.2.23123.3 + 8.0.100-preview.2.23123.4 + 8.0.100-preview.2.23123.4 + 8.0.100-preview.2.23123.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a3a2b836e4587c80529297e30298ff00e8cb2059 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 13:30:13 +0000 Subject: [PATCH 307/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230222.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23121.1 -> To Version 8.0.0-alpha.1.23122.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0c88bea3..1f5750a19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,9 +183,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 616f121630a3c46bff2cd7f50640f051f446070d + 54b1cf7905203a71e6883d2a3b8ea61d487cefdb From 21219e4a17411bde461e81a3c62c228330ef2c0c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 23 Feb 2023 15:50:29 +0000 Subject: [PATCH 308/864] Remove backported source-build razor patch --- ...Add-some-projects-to-Razor.Slim.slnf.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch diff --git a/src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch b/src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch deleted file mode 100644 index edebfd184..000000000 --- a/src/SourceBuild/patches/razor/0001-Add-some-projects-to-Razor.Slim.slnf.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: davidwengier -Date: Mon, 30 Jan 2023 15:40:22 +0000 -Subject: [PATCH] Add some projects to Razor.Slim.slnf - -Backport: https://github.com/dotnet/razor/pull/8188 ---- - Razor.Slim.slnf | 3 +++ - .../Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj | 2 ++ - 2 files changed, 5 insertions(+) - -diff --git a/Razor.Slim.slnf b/Razor.Slim.slnf -index 6e76d40f1..8328075c4 100644 ---- a/Razor.Slim.slnf -+++ b/Razor.Slim.slnf -@@ -6,6 +6,9 @@ - "src\\Compiler\\Microsoft.AspNetCore.Mvc.Razor.Extensions\\src\\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj", - "src\\Compiler\\Microsoft.AspNetCore.Razor.Language\\src\\Microsoft.AspNetCore.Razor.Language.csproj", - "src\\Compiler\\Microsoft.CodeAnalysis.Razor\\src\\Microsoft.CodeAnalysis.Razor.csproj", -+ "src\\Compiler\\Microsoft.NET.Sdk.Razor.SourceGenerators.Transport\\Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj", -+ "src\\Compiler\\tools\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj", -+ "src\\Compiler\\tools\\Microsoft.CodeAnalysis.Razor.Tooling.Internal\\Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj", - "src\\Shared\\Microsoft.AspNetCore.Razor.LanguageSupport\\Microsoft.AspNetCore.Razor.LanguageSupport.csproj", - "src\\Razor\\src\\Microsoft.AspNetCore.Razor.Common\\Microsoft.AspNetCore.Razor.Common.csproj", - "src\\Razor\\src\\Microsoft.CodeAnalysis.Razor.Workspaces\\Microsoft.CodeAnalysis.Razor.Workspaces.csproj", -diff --git a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj -index 278e35a42..745645fc9 100644 ---- a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj -+++ b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj -@@ -8,6 +8,8 @@ - true - false - true -+ -+ false - - - From 8a69d6e0544c4b19359b9e8e9f566762c9065e0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 17:01:18 +0000 Subject: [PATCH 309/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23123.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e123412c1..4e284ad2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0338c0af8beed93e2e2c277b3119fb340c9b3f57 + 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 - + https://github.com/dotnet/sdk - 0338c0af8beed93e2e2c277b3119fb340c9b3f57 + 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 - + https://github.com/dotnet/sdk - 0338c0af8beed93e2e2c277b3119fb340c9b3f57 + 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 - + https://github.com/dotnet/sdk - 0338c0af8beed93e2e2c277b3119fb340c9b3f57 + 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 @@ -142,9 +142,9 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7aa95c5e4..ccc29edb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23123.4 - 8.0.100-preview.2.23123.4 - 8.0.100-preview.2.23123.4 + 8.0.100-preview.2.23123.5 + 8.0.100-preview.2.23123.5 + 8.0.100-preview.2.23123.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 2.1.0 From f9ace66b6490bb453a7eee310b89c50ab8143540 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 17:57:25 +0000 Subject: [PATCH 310/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23123.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (parent: Microsoft.NET.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 4e284ad2f..55a71957a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 + 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b - + https://github.com/dotnet/sdk - 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 + 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b - + https://github.com/dotnet/sdk - 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 + 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b - + https://github.com/dotnet/sdk - 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 + 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b diff --git a/eng/Versions.props b/eng/Versions.props index ccc29edb9..f8e26376e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23123.5 - 8.0.100-preview.2.23123.5 - 8.0.100-preview.2.23123.5 + 8.0.100-preview.2.23123.6 + 8.0.100-preview.2.23123.6 + 8.0.100-preview.2.23123.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 89e9bcfd7fcde2a9e4f4ebca574fb31a28fab366 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 18:27:03 +0000 Subject: [PATCH 311/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.1 -> To Version 7.0.300-preview.23123.7 --- 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 92935a8de..b5127b1f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 - + https://github.com/dotnet/sdk - 854826d569ad743a0d55fde44a7d642e5d646745 + 904d0d9c253889457ab70cbb335a49cc01a9f901 diff --git a/eng/Versions.props b/eng/Versions.props index 2b20c7459..f34ec3b3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.1 - 7.0.300-preview.23123.1 - 7.0.300-preview.23123.1 + 7.0.300-preview.23123.7 + 7.0.300-preview.23123.7 + 7.0.300-preview.23123.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a160c82712b2a7718b9ff0c7c2e400f3826754c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 18:33:59 +0000 Subject: [PATCH 312/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230223.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23122.2 -> To Version 8.0.0-alpha.1.23123.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f5750a19..fffb3ad8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - abf867508a6c495f28afe610fa56e5767b1c3ff7 + de6165fa97db158d0ea1ef402efa85cd39c7dc79 From 32e426771d0d9dd24e789204adb27502751591cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 18:53:05 +0000 Subject: [PATCH 313/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23117.3 -> To Version 8.0.100-preview.2.23123.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23116.2 -> To Version 8.0.0-preview.2.23122.1 (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 55a71957a..04861689d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/sdk - 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/sdk - 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb - + https://github.com/dotnet/sdk - 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b + 54b606809284ce969f0ef6f1bd0b7cc263c90ddb @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf c37ab558d3aebf3bfe0038c86e8a4be78d09e03c - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e @@ -151,9 +151,9 @@ 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 diff --git a/eng/Versions.props b/eng/Versions.props index f8e26376e..7b5e822e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23123.6 - 8.0.100-preview.2.23123.6 - 8.0.100-preview.2.23123.6 + 8.0.100-preview.2.23123.8 + 8.0.100-preview.2.23123.8 + 8.0.100-preview.2.23123.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee2f220afa045cf23caa080dcf96cda6b556c8b4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 23 Feb 2023 11:37:50 -0800 Subject: [PATCH 314/864] Enable PVP flow for SBRP and sourcelink (#15437) Co-authored-by: Michael Simons --- .../content/repo-projects/source-build-reference-packages.proj | 2 ++ src/SourceBuild/content/repo-projects/sourcelink.proj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index 4c535e89c..8a96a14c8 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -12,6 +12,8 @@ true + + DependenciesOnly diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj index a048b6a1f..ac56e1d16 100644 --- a/src/SourceBuild/content/repo-projects/sourcelink.proj +++ b/src/SourceBuild/content/repo-projects/sourcelink.proj @@ -8,6 +8,8 @@ true + + DependenciesOnly From 20311135cc9b4ff16f63319a8d784026ecb15256 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:26:51 +0000 Subject: [PATCH 315/864] Update dependencies from https://github.com/dotnet/arcade build 20230222.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23117.3 -> To Version 7.0.0-beta.23122.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92935a8de..b176f1dab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2b20c7459..b866f166d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23117.3 + 7.0.0-beta.23122.4 diff --git a/global.json b/global.json index dfd6be6d5..9890ccd94 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" } } From 63512f7023ba2338c3050cb3d06dbf72286b2429 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:26:55 +0000 Subject: [PATCH 316/864] Update dependencies from https://github.com/dotnet/arcade build 20230222.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23122.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e8a65610..dff3649ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 537c5a15b..717c9ea98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23117.3 + 7.0.0-beta.23122.4 diff --git a/global.json b/global.json index dfd6be6d5..9890ccd94 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23117.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" } } From 8bd6967a4c0702392b56c93b757236a8995140af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 23:19:27 +0000 Subject: [PATCH 317/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.8 -> To Version 8.0.100-preview.2.23123.9 --- 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 d0c4385d8..af70d47b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 54b606809284ce969f0ef6f1bd0b7cc263c90ddb + 37d204c740a42b8580b5f94e69cd7b59d1841410 - + https://github.com/dotnet/sdk - 54b606809284ce969f0ef6f1bd0b7cc263c90ddb + 37d204c740a42b8580b5f94e69cd7b59d1841410 - + https://github.com/dotnet/sdk - 54b606809284ce969f0ef6f1bd0b7cc263c90ddb + 37d204c740a42b8580b5f94e69cd7b59d1841410 - + https://github.com/dotnet/sdk - 54b606809284ce969f0ef6f1bd0b7cc263c90ddb + 37d204c740a42b8580b5f94e69cd7b59d1841410 diff --git a/eng/Versions.props b/eng/Versions.props index b8ba016f4..31ca3c90f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23123.8 - 8.0.100-preview.2.23123.8 - 8.0.100-preview.2.23123.8 + 8.0.100-preview.2.23123.9 + 8.0.100-preview.2.23123.9 + 8.0.100-preview.2.23123.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ec5a883bd60a3804dad4e0af2c9ab5985f5ac7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 01:44:51 +0000 Subject: [PATCH 318/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230223.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23122.2 -> To Version 8.0.0-alpha.1.23123.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fffb3ad8e..b49a61786 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - de6165fa97db158d0ea1ef402efa85cd39c7dc79 + 71ff04ed77c685b62f0b377ccdd4c17b8b6c15e6 From be26fd6e722dc8899083af2a8d85bd20c56f5a4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:11:26 +0000 Subject: [PATCH 319/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.9 -> To Version 8.0.100-preview.2.23123.11 --- 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 f5605d412..92377f0ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 37d204c740a42b8580b5f94e69cd7b59d1841410 + 1bc914b85debdf89193dda23a32345e25e6df4cb - + https://github.com/dotnet/sdk - 37d204c740a42b8580b5f94e69cd7b59d1841410 + 1bc914b85debdf89193dda23a32345e25e6df4cb - + https://github.com/dotnet/sdk - 37d204c740a42b8580b5f94e69cd7b59d1841410 + 1bc914b85debdf89193dda23a32345e25e6df4cb - + https://github.com/dotnet/sdk - 37d204c740a42b8580b5f94e69cd7b59d1841410 + 1bc914b85debdf89193dda23a32345e25e6df4cb diff --git a/eng/Versions.props b/eng/Versions.props index 31ca3c90f..dbd7b7142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23123.9 - 8.0.100-preview.2.23123.9 - 8.0.100-preview.2.23123.9 + 8.0.100-preview.2.23123.11 + 8.0.100-preview.2.23123.11 + 8.0.100-preview.2.23123.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7717d4e146e093781e33245b2d0ec2a3b750fe03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:38:46 +0000 Subject: [PATCH 320/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.7 -> To Version 7.0.300-preview.23123.10 --- 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 d7b5451b7..c0193d67f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b - + https://github.com/dotnet/sdk - 904d0d9c253889457ab70cbb335a49cc01a9f901 + 308e7840125579279180a45461c113966f39cb7b diff --git a/eng/Versions.props b/eng/Versions.props index c3d9206e2..470782284 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.7 - 7.0.300-preview.23123.7 - 7.0.300-preview.23123.7 + 7.0.300-preview.23123.10 + 7.0.300-preview.23123.10 + 7.0.300-preview.23123.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4fbfc4189db4764db8bc761999039c22bee7c12e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 04:15:10 +0000 Subject: [PATCH 321/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.9 -> To Version 8.0.100-preview.2.23123.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23123.1 -> To Version 8.0.0-preview.2.23123.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92377f0ed..75e62c214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 7514f9bc0755cdb942b1426c99e57abb129f6f43 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1bc914b85debdf89193dda23a32345e25e6df4cb + ce13948f7ec6e989d9caac1ed7b25128f0eac81f - + https://github.com/dotnet/sdk - 1bc914b85debdf89193dda23a32345e25e6df4cb + ce13948f7ec6e989d9caac1ed7b25128f0eac81f - + https://github.com/dotnet/sdk - 1bc914b85debdf89193dda23a32345e25e6df4cb + ce13948f7ec6e989d9caac1ed7b25128f0eac81f - + https://github.com/dotnet/sdk - 1bc914b85debdf89193dda23a32345e25e6df4cb + ce13948f7ec6e989d9caac1ed7b25128f0eac81f @@ -142,9 +142,9 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index dbd7b7142..58e882e12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23123.11 - 8.0.100-preview.2.23123.11 - 8.0.100-preview.2.23123.11 + 8.0.100-preview.2.23123.12 + 8.0.100-preview.2.23123.12 + 8.0.100-preview.2.23123.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 2.1.0 From af8c1fc956e873e14ea6ba9ebe65db8a430d6534 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 04:48:53 +0000 Subject: [PATCH 322/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.7 -> To Version 7.0.300-preview.23123.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23122.4 -> To Version 12.5.0-beta.23123.2 (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 c0193d67f..73ea85d35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e - + https://github.com/dotnet/sdk - 308e7840125579279180a45461c113966f39cb7b + 55a430259c58334f7fd6d573b5d70d9d1ef0a11e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 77528ef88dcffb9a089bea428bc95037a089a206 - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 77528ef88dcffb9a089bea428bc95037a089a206 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + 104f0dcd74804aaf0b02df745910e9ab3973d758 diff --git a/eng/Versions.props b/eng/Versions.props index 470782284..6f72b256f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.10 - 7.0.300-preview.23123.10 - 7.0.300-preview.23123.10 + 7.0.300-preview.23123.13 + 7.0.300-preview.23123.13 + 7.0.300-preview.23123.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4a5bf55d9b3969fa8c58681002a95dabac63b8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 06:52:20 +0000 Subject: [PATCH 323/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.12 -> To Version 8.0.100-preview.2.23123.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-preview.2.23122.6 -> To Version 8.0.0-preview.2.23123.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75e62c214..303a6a59c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ce13948f7ec6e989d9caac1ed7b25128f0eac81f + 0331e57ffd9db7a4094bbc32a308811e16203924 - + https://github.com/dotnet/sdk - ce13948f7ec6e989d9caac1ed7b25128f0eac81f + 0331e57ffd9db7a4094bbc32a308811e16203924 - + https://github.com/dotnet/sdk - ce13948f7ec6e989d9caac1ed7b25128f0eac81f + 0331e57ffd9db7a4094bbc32a308811e16203924 - + https://github.com/dotnet/sdk - ce13948f7ec6e989d9caac1ed7b25128f0eac81f + 0331e57ffd9db7a4094bbc32a308811e16203924 @@ -156,9 +156,9 @@ f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 - + https://github.com/nuget/nuget.client - 00375a7dfc2e2687c95ada0a0d24b570dc807d5d + 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 diff --git a/eng/Versions.props b/eng/Versions.props index 58e882e12..32c2801ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 0.2.0 - 8.0.100-preview.2.23123.12 - 8.0.100-preview.2.23123.12 - 8.0.100-preview.2.23123.12 + 8.0.100-preview.2.23123.15 + 8.0.100-preview.2.23123.15 + 8.0.100-preview.2.23123.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 895cd71b001887f8e2cb5900c3f8353419ad4a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 06:55:19 +0000 Subject: [PATCH 324/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23123.14 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-2.23123.5 -> To Version 4.6.0-2.23123.8 (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 73ea85d35..d80743eb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f - + https://github.com/dotnet/sdk - 55a430259c58334f7fd6d573b5d70d9d1ef0a11e + 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 diff --git a/eng/Versions.props b/eng/Versions.props index 6f72b256f..ddcb32309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.13 - 7.0.300-preview.23123.13 - 7.0.300-preview.23123.13 + 7.0.300-preview.23123.14 + 7.0.300-preview.23123.14 + 7.0.300-preview.23123.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afe278eb1d38ac63cf1b03f2002728a3ab56abc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 07:58:23 +0000 Subject: [PATCH 325/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.12 -> To Version 8.0.100-preview.2.23123.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23122.1 -> To Version 8.0.0-preview.2.23123.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 303a6a59c..1f9315036 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 https://github.com/dotnet/aspnetcore @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0331e57ffd9db7a4094bbc32a308811e16203924 + 81045cbe76d2d648633d32c401fd94dc8a5ccf87 - + https://github.com/dotnet/sdk - 0331e57ffd9db7a4094bbc32a308811e16203924 + 81045cbe76d2d648633d32c401fd94dc8a5ccf87 - + https://github.com/dotnet/sdk - 0331e57ffd9db7a4094bbc32a308811e16203924 + 81045cbe76d2d648633d32c401fd94dc8a5ccf87 - + https://github.com/dotnet/sdk - 0331e57ffd9db7a4094bbc32a308811e16203924 + 81045cbe76d2d648633d32c401fd94dc8a5ccf87 - + https://github.com/dotnet/winforms - 46195b1c4ad995a32046cbeeeb8d650550685c28 + bba30b55a0ba2a5268709b8c616dc5e2cd2dc6a8 - + https://github.com/dotnet/wpf - c37ab558d3aebf3bfe0038c86e8a4be78d09e03c + 6b67a31bca9cf848bb246895e046229dfb36bacc https://github.com/dotnet/fsharp @@ -142,9 +142,9 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 32c2801ff..c87532c25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23121.7 + 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23121.2 + 8.0.0-preview.2.23122.1 @@ -71,33 +71,33 @@ - 8.0.100-preview.2.23123.15 - 8.0.100-preview.2.23123.15 - 8.0.100-preview.2.23123.15 + 8.0.100-preview.2.23123.16 + 8.0.100-preview.2.23123.16 + 8.0.100-preview.2.23123.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 2.1.0 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 - 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 From 5a65e387fa11d5184769a51465dd454b3cf66646 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 08:07:23 +0000 Subject: [PATCH 326/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23123.17 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.6.0-2.23123.5 -> To Version 4.6.0-2.23123.8 (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 d80743eb9..57b1d54f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 - + https://github.com/dotnet/sdk - 120d35f4a6d19fbe8f9a84adbf1ea542f54ffb2f + 26d4e2192c99c84285828118182800bb85f66101 @@ -154,9 +154,9 @@ 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/nuget/nuget.client - 55728432057dc57733661fe01e9c8493ab5034f2 + 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 diff --git a/eng/Versions.props b/eng/Versions.props index ddcb32309..d5bfedaeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.14 - 7.0.300-preview.23123.14 - 7.0.300-preview.23123.14 + 7.0.300-preview.23123.17 + 7.0.300-preview.23123.17 + 7.0.300-preview.23123.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 97398ccf7cbc55956c5ee1aa546a052c6fedd117 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 09:03:46 +0000 Subject: [PATCH 327/864] Update dependencies from https://github.com/dotnet/sdk build 20230223.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.12 -> To Version 8.0.100-preview.2.23123.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23122.1 -> To Version 8.0.0-preview.2.23123.1 (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 1f9315036..ce860fc73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 81045cbe76d2d648633d32c401fd94dc8a5ccf87 + 74c01c35576265859b1e37e7459b52df2c77f1f1 - + https://github.com/dotnet/sdk - 81045cbe76d2d648633d32c401fd94dc8a5ccf87 + 74c01c35576265859b1e37e7459b52df2c77f1f1 - + https://github.com/dotnet/sdk - 81045cbe76d2d648633d32c401fd94dc8a5ccf87 + 74c01c35576265859b1e37e7459b52df2c77f1f1 - + https://github.com/dotnet/sdk - 81045cbe76d2d648633d32c401fd94dc8a5ccf87 + 74c01c35576265859b1e37e7459b52df2c77f1f1 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a diff --git a/eng/Versions.props b/eng/Versions.props index c87532c25..03178ce57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23123.16 - 8.0.100-preview.2.23123.16 - 8.0.100-preview.2.23123.16 + 8.0.100-preview.2.23123.18 + 8.0.100-preview.2.23123.18 + 8.0.100-preview.2.23123.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1fdf8fcc2db28420fc09241348c58df463a844dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 09:27:54 +0000 Subject: [PATCH 328/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23124.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23123.2 -> To Version 12.5.0-beta.23123.3 (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 57b1d54f5..66d7be599 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 - + https://github.com/dotnet/sdk - 26d4e2192c99c84285828118182800bb85f66101 + 650dc2d9a0ad6105087530882930029396b0f907 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 77528ef88dcffb9a089bea428bc95037a089a206 + 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/dotnet/fsharp - 77528ef88dcffb9a089bea428bc95037a089a206 + 6fb3ae3c29411266f6ccc938ec922a49b61a319c diff --git a/eng/Versions.props b/eng/Versions.props index d5bfedaeb..57ae59eb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23123.17 - 7.0.300-preview.23123.17 - 7.0.300-preview.23123.17 + 7.0.300-preview.23124.1 + 7.0.300-preview.23124.1 + 7.0.300-preview.23124.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c1642eb4b7c6ccdcf7918826ca2e51484ae2fca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 10:43:45 +0000 Subject: [PATCH 329/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23123.13 -> To Version 7.0.300-preview.23124.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23123.2 -> To Version 12.5.0-beta.23123.3 (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 66d7be599..0282bdfea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe - + https://github.com/dotnet/sdk - 650dc2d9a0ad6105087530882930029396b0f907 + 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a diff --git a/eng/Versions.props b/eng/Versions.props index 57ae59eb4..2b950c456 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.1 - 7.0.300-preview.23124.1 - 7.0.300-preview.23124.1 + 7.0.300-preview.23124.2 + 7.0.300-preview.23124.2 + 7.0.300-preview.23124.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 77545e2aea1fca8c5650ebb52f75ab8d3a72c5f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 12:33:24 +0000 Subject: [PATCH 330/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.12 -> To Version 8.0.100-preview.2.23124.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23122.1 -> To Version 8.0.0-preview.2.23123.1 (parent: Microsoft.NET.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 ce860fc73..46a5b9542 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 74c01c35576265859b1e37e7459b52df2c77f1f1 + 4ac71cb92940b83009322aa45ecf7abd42961b9e - + https://github.com/dotnet/sdk - 74c01c35576265859b1e37e7459b52df2c77f1f1 + 4ac71cb92940b83009322aa45ecf7abd42961b9e - + https://github.com/dotnet/sdk - 74c01c35576265859b1e37e7459b52df2c77f1f1 + 4ac71cb92940b83009322aa45ecf7abd42961b9e - + https://github.com/dotnet/sdk - 74c01c35576265859b1e37e7459b52df2c77f1f1 + 4ac71cb92940b83009322aa45ecf7abd42961b9e diff --git a/eng/Versions.props b/eng/Versions.props index 03178ce57..a19633c51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23123.18 - 8.0.100-preview.2.23123.18 - 8.0.100-preview.2.23123.18 + 8.0.100-preview.2.23124.3 + 8.0.100-preview.2.23124.3 + 8.0.100-preview.2.23124.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 698a7f8dc59df95120c28948307e4c242005511d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 13:19:13 +0000 Subject: [PATCH 331/864] Update dependencies from https://github.com/dotnet/arcade build 20230223.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23120.1 -> To Version 8.0.0-beta.23123.2 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23117-02 -> To Version 1.2.0-beta-23121-02 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 25 ++++++++++++++++++++----- eng/common/templates/job/job.yml | 2 +- global.json | 6 +++--- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75e62c214..95d62c2e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ 71ff04ed77c685b62f0b377ccdd4c17b8b6c15e6 - + https://github.com/dotnet/sourcelink - 955e79b0b955a9f57078b2399a782fcde44a9261 + 401652e13a35e7f139d0df71ef75a7a737272959 - + https://github.com/dotnet/xliff-tasks - 69157952aba0f08738249af4454b045b553614c4 + c92d29d251f88bc3a9fa958efaad048bdabbf8a9 diff --git a/eng/Versions.props b/eng/Versions.props index 58e882e12..95bcd747d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23120.1 + 8.0.0-beta.23123.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ffaa88eb0..f027af759 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -260,25 +260,40 @@ while :; do ;; jessie) # Debian 8 __CodeName=jessie - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; stretch) # Debian 9 __CodeName=stretch - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; buster) # Debian 10 __CodeName=buster - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; bullseye) # Debian 11 __CodeName=bullseye - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; sid) # Debian sid __CodeName=sid - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; tizen) __CodeName= diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 61914a1fb..b214a31db 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -101,7 +101,7 @@ jobs: # handle key-value variable syntax. # example: # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - ${{ each pair in variable }}: - name: ${{ pair.key }} value: ${{ pair.value }} diff --git a/global.json b/global.json index e48079a73..f70c64842 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23061.8", + "dotnet": "8.0.100-preview.1.23115.2", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23123.2" } } From 736c8963262aa5e1b0c02f7b496d3ec1485aaaf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 13:39:51 +0000 Subject: [PATCH 332/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230223.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23122.1 -> To Version 8.0.0-alpha.1.23123.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75e62c214..040c9ce60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,9 +183,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 54b1cf7905203a71e6883d2a3b8ea61d487cefdb + 8e1b361dfb41ed15955a3793d4da1f2cf8129fb0 From ace879f9f3ff7f37d9084b34883edf9605f8b3f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 14:55:50 +0000 Subject: [PATCH 333/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23123.12 -> To Version 8.0.100-preview.2.23124.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23122.1 -> To Version 8.0.0-preview.2.23123.1 (parent: Microsoft.NET.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 46a5b9542..afcf17be9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 4ac71cb92940b83009322aa45ecf7abd42961b9e + c1d196f185ee338979de224bc987e2b5f9bc601e - + https://github.com/dotnet/sdk - 4ac71cb92940b83009322aa45ecf7abd42961b9e + c1d196f185ee338979de224bc987e2b5f9bc601e - + https://github.com/dotnet/sdk - 4ac71cb92940b83009322aa45ecf7abd42961b9e + c1d196f185ee338979de224bc987e2b5f9bc601e - + https://github.com/dotnet/sdk - 4ac71cb92940b83009322aa45ecf7abd42961b9e + c1d196f185ee338979de224bc987e2b5f9bc601e diff --git a/eng/Versions.props b/eng/Versions.props index a19633c51..4b6acadd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23124.3 - 8.0.100-preview.2.23124.3 - 8.0.100-preview.2.23124.3 + 8.0.100-preview.2.23124.4 + 8.0.100-preview.2.23124.4 + 8.0.100-preview.2.23124.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 07eedba89633a0d3a50d91f6125c48497ae51a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 18:21:15 +0000 Subject: [PATCH 334/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23124.4 -> To Version 8.0.100-preview.2.23124.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23122.4 -> To Version 12.5.0-beta.23123.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 8 ++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5942caa7f..95e98a72d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c1d196f185ee338979de224bc987e2b5f9bc601e + 55167e6a9a21c0a589de8b6be8518a35e6d8e117 - + https://github.com/dotnet/sdk - c1d196f185ee338979de224bc987e2b5f9bc601e + 55167e6a9a21c0a589de8b6be8518a35e6d8e117 - + https://github.com/dotnet/sdk - c1d196f185ee338979de224bc987e2b5f9bc601e + 55167e6a9a21c0a589de8b6be8518a35e6d8e117 - + https://github.com/dotnet/sdk - c1d196f185ee338979de224bc987e2b5f9bc601e + 55167e6a9a21c0a589de8b6be8518a35e6d8e117 @@ -128,32 +128,32 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/microsoft/vstest - 3990c633bcf933291f40d44c0b7586c3a6e89d55 + 05c0c4c4f084782533443dfeae0f6627018c5b6a https://github.com/dotnet/runtime 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 diff --git a/eng/Versions.props b/eng/Versions.props index a6e194a09..e1e2f2d8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23124.4 - 8.0.100-preview.2.23124.4 - 8.0.100-preview.2.23124.4 + 8.0.100-preview.2.23124.5 + 8.0.100-preview.2.23124.5 + 8.0.100-preview.2.23124.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230221-02 + 17.6.0-preview-20230223-05 8.0.0-alpha.1.22557.12 From e7f2ee11cc808bed6ea7278ee83a6126012fc4fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 18:48:26 +0000 Subject: [PATCH 335/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.2 -> To Version 7.0.300-preview.23124.6 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0282bdfea..ee56035c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 - + https://github.com/dotnet/sdk - 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe + 6406aec83e9784635cabe9d5b313bb7789112c28 @@ -133,9 +133,9 @@ 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/microsoft/vstest - 3990c633bcf933291f40d44c0b7586c3a6e89d55 + 05c0c4c4f084782533443dfeae0f6627018c5b6a @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + b80df1b027ab46d65c6986c33840721ff71ba0c0 diff --git a/eng/Versions.props b/eng/Versions.props index 2b950c456..764bd2d39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.2 - 7.0.300-preview.23124.2 - 7.0.300-preview.23124.2 + 7.0.300-preview.23124.6 + 7.0.300-preview.23124.6 + 7.0.300-preview.23124.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230221-02 + 17.6.0-preview-20230223-05 From 4297666604fb3c70daf21fa4fe5cbdff5dedd113 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 19:30:57 +0000 Subject: [PATCH 336/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23124.4 -> To Version 8.0.100-preview.2.23124.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23122.4 -> To Version 12.5.0-beta.23123.3 (parent: Microsoft.NET.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 95e98a72d..2ad289899 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 55167e6a9a21c0a589de8b6be8518a35e6d8e117 + e90991135e27bd447316efa5e634c29604865555 - + https://github.com/dotnet/sdk - 55167e6a9a21c0a589de8b6be8518a35e6d8e117 + e90991135e27bd447316efa5e634c29604865555 - + https://github.com/dotnet/sdk - 55167e6a9a21c0a589de8b6be8518a35e6d8e117 + e90991135e27bd447316efa5e634c29604865555 - + https://github.com/dotnet/sdk - 55167e6a9a21c0a589de8b6be8518a35e6d8e117 + e90991135e27bd447316efa5e634c29604865555 diff --git a/eng/Versions.props b/eng/Versions.props index e1e2f2d8b..ad14ab3cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23124.5 - 8.0.100-preview.2.23124.5 - 8.0.100-preview.2.23124.5 + 8.0.100-preview.2.23124.7 + 8.0.100-preview.2.23124.7 + 8.0.100-preview.2.23124.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c0194383a6e51bacc226856761d0a4e99bd51a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 20:03:41 +0000 Subject: [PATCH 337/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.2 -> To Version 7.0.300-preview.23124.8 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 (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 ee56035c7..b17d39ce0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 - + https://github.com/dotnet/sdk - 6406aec83e9784635cabe9d5b313bb7789112c28 + 459ad47e717d72d6f9d1314c50fbeb0e26c24007 @@ -149,9 +149,9 @@ b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be diff --git a/eng/Versions.props b/eng/Versions.props index 764bd2d39..5e4cc9a6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.6 - 7.0.300-preview.23124.6 - 7.0.300-preview.23124.6 + 7.0.300-preview.23124.8 + 7.0.300-preview.23124.8 + 7.0.300-preview.23124.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26e5476da1523e12be5259da27cd8c3aea32cb88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 20:11:26 +0000 Subject: [PATCH 338/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23124.4 -> To Version 8.0.100-preview.2.23124.12 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23122.4 -> To Version 12.5.0-beta.23123.3 (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 2ad289899..bfd066091 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e90991135e27bd447316efa5e634c29604865555 + baa961fd764363712dc98d00881ac4994acfcf1b - + https://github.com/dotnet/sdk - e90991135e27bd447316efa5e634c29604865555 + baa961fd764363712dc98d00881ac4994acfcf1b - + https://github.com/dotnet/sdk - e90991135e27bd447316efa5e634c29604865555 + baa961fd764363712dc98d00881ac4994acfcf1b - + https://github.com/dotnet/sdk - e90991135e27bd447316efa5e634c29604865555 + baa961fd764363712dc98d00881ac4994acfcf1b @@ -156,9 +156,9 @@ 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/nuget/nuget.client - 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 + 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 diff --git a/eng/Versions.props b/eng/Versions.props index ad14ab3cf..69f089b8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.2.23124.7 - 8.0.100-preview.2.23124.7 - 8.0.100-preview.2.23124.7 + 8.0.100-preview.2.23124.12 + 8.0.100-preview.2.23124.12 + 8.0.100-preview.2.23124.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba807c57b54f046a6040c8cbab6729e39fc40911 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:04:28 +0000 Subject: [PATCH 339/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.2.23124.4 -> To Version 8.0.100-preview.2.23124.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23123.5 -> To Version 8.0.0-preview.2.23124.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfd066091..caba687f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - baa961fd764363712dc98d00881ac4994acfcf1b + 12209f087e1c0256db8b08e7e7217f7526628d8b - + https://github.com/dotnet/sdk - baa961fd764363712dc98d00881ac4994acfcf1b + 12209f087e1c0256db8b08e7e7217f7526628d8b - + https://github.com/dotnet/sdk - baa961fd764363712dc98d00881ac4994acfcf1b + 12209f087e1c0256db8b08e7e7217f7526628d8b - + https://github.com/dotnet/sdk - baa961fd764363712dc98d00881ac4994acfcf1b + 12209f087e1c0256db8b08e7e7217f7526628d8b @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 69f089b8b..5d12f5558 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.2.23124.12 - 8.0.100-preview.2.23124.12 - 8.0.100-preview.2.23124.12 + 8.0.100-preview.2.23124.14 + 8.0.100-preview.2.23124.14 + 8.0.100-preview.2.23124.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 2.1.0 From 502cbe0e3aa2c1c75470737260f215d67ddb232f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:35:31 +0000 Subject: [PATCH 340/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.2 -> To Version 7.0.300-preview.23124.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 (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 b17d39ce0..9dd5bae5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a - + https://github.com/dotnet/sdk - 459ad47e717d72d6f9d1314c50fbeb0e26c24007 + 71f20e519f052f85443e1a0f36f70b1dc6ffb67a @@ -154,9 +154,9 @@ d434c0e464ee0c119bdd5ee87b448e16fe0786be - + https://github.com/nuget/nuget.client - 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 + 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 diff --git a/eng/Versions.props b/eng/Versions.props index 5e4cc9a6e..b7f899038 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.8 - 7.0.300-preview.23124.8 - 7.0.300-preview.23124.8 + 7.0.300-preview.23124.13 + 7.0.300-preview.23124.13 + 7.0.300-preview.23124.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f16d4480fabe018cc8d6220c478e312bef4dda48 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 24 Feb 2023 14:01:25 -0800 Subject: [PATCH 341/864] Update branding to preview 3 as preview 2 branch has snapped --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a6e194a09..c8e20b2ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview - 2 + 3 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From c691afbc08298ce14ca27e1c6405d94104b77fc2 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 24 Feb 2023 14:22:54 -0800 Subject: [PATCH 342/864] Update installer table to point to preview 2 instead of 1 as branches have snapped --- README.md | 156 +++++++++++++++++++++++++++--------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/README.md b/README.md index 2d620dde0..9d90ec040 100644 --- a/README.md +++ b/README.md @@ -162,20 +162,20 @@ Do not directly edit the table below. Use https://github.com/dotnet/installer/tr ### Table *Note* the 7.0.100 build will be finished internally. Below is the last public version available from that branch but is not fully updated with the final runtime. -| Platform | main
(8.0.x Runtime) | 8.0.1xx-preview1
(8.0-preview1 Runtime) | Release/7.0.3xx
(7.0.x Runtime) | +| Platform | main
(8.0.x Runtime) | 8.0.1xx-preview2
(8.0-preview2 Runtime) | Release/7.0.3xx
(7.0.x Runtime) | | :--------- | :----------: | :----------: | :----------: | -| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-8.0.1XX-preview1]][win-x64-version-8.0.1XX-preview1]
[Installer][win-x64-installer-8.0.1XX-preview1] - [Checksum][win-x64-installer-checksum-8.0.1XX-preview1]
[zip][win-x64-zip-8.0.1XX-preview1] - [Checksum][win-x64-zip-checksum-8.0.1XX-preview1] | [![][win-x64-badge-7.0.3XX]][win-x64-version-7.0.3XX]
[Installer][win-x64-installer-7.0.3XX] - [Checksum][win-x64-installer-checksum-7.0.3XX]
[zip][win-x64-zip-7.0.3XX] - [Checksum][win-x64-zip-checksum-7.0.3XX] | -| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-8.0.1XX-preview1]][win-x86-version-8.0.1XX-preview1]
[Installer][win-x86-installer-8.0.1XX-preview1] - [Checksum][win-x86-installer-checksum-8.0.1XX-preview1]
[zip][win-x86-zip-8.0.1XX-preview1] - [Checksum][win-x86-zip-checksum-8.0.1XX-preview1] | [![][win-x86-badge-7.0.3XX]][win-x86-version-7.0.3XX]
[Installer][win-x86-installer-7.0.3XX] - [Checksum][win-x86-installer-checksum-7.0.3XX]
[zip][win-x86-zip-7.0.3XX] - [Checksum][win-x86-zip-checksum-7.0.3XX] | +| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-8.0.1XX-preview2]][win-x64-version-8.0.1XX-preview2]
[Installer][win-x64-installer-8.0.1XX-preview2] - [Checksum][win-x64-installer-checksum-8.0.1XX-preview2]
[zip][win-x64-zip-8.0.1XX-preview2] - [Checksum][win-x64-zip-checksum-8.0.1XX-preview2] | [![][win-x64-badge-7.0.3XX]][win-x64-version-7.0.3XX]
[Installer][win-x64-installer-7.0.3XX] - [Checksum][win-x64-installer-checksum-7.0.3XX]
[zip][win-x64-zip-7.0.3XX] - [Checksum][win-x64-zip-checksum-7.0.3XX] | +| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-8.0.1XX-preview2]][win-x86-version-8.0.1XX-preview2]
[Installer][win-x86-installer-8.0.1XX-preview2] - [Checksum][win-x86-installer-checksum-8.0.1XX-preview2]
[zip][win-x86-zip-8.0.1XX-preview2] - [Checksum][win-x86-zip-checksum-8.0.1XX-preview2] | [![][win-x86-badge-7.0.3XX]][win-x86-version-7.0.3XX]
[Installer][win-x86-installer-7.0.3XX] - [Checksum][win-x86-installer-checksum-7.0.3XX]
[zip][win-x86-zip-7.0.3XX] - [Checksum][win-x86-zip-checksum-7.0.3XX] | | **Windows arm** | **N/A** | **N/A** | **N/A** | -| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-8.0.1XX-preview1]][win-arm64-version-8.0.1XX-preview1]
[Installer][win-arm64-installer-8.0.1XX-preview1] - [Checksum][win-arm64-installer-checksum-8.0.1XX-preview1]
[zip][win-arm64-zip-8.0.1XX-preview1] | [![][win-arm64-badge-7.0.3XX]][win-arm64-version-7.0.3XX]
[Installer][win-arm64-installer-7.0.3XX] - [Checksum][win-arm64-installer-checksum-7.0.3XX]
[zip][win-arm64-zip-7.0.3XX] | -| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-8.0.1XX-preview1]][osx-x64-version-8.0.1XX-preview1]
[Installer][osx-x64-installer-8.0.1XX-preview1] - [Checksum][osx-x64-installer-checksum-8.0.1XX-preview1]
[tar.gz][osx-x64-targz-8.0.1XX-preview1] - [Checksum][osx-x64-targz-checksum-8.0.1XX-preview1] | [![][osx-x64-badge-7.0.3XX]][osx-x64-version-7.0.3XX]
[Installer][osx-x64-installer-7.0.3XX] - [Checksum][osx-x64-installer-checksum-7.0.3XX]
[tar.gz][osx-x64-targz-7.0.3XX] - [Checksum][osx-x64-targz-checksum-7.0.3XX] | -| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-8.0.1XX-preview1]][osx-arm64-version-8.0.1XX-preview1]
[Installer][osx-arm64-installer-8.0.1XX-preview1] - [Checksum][osx-arm64-installer-checksum-8.0.1XX-preview1]
[tar.gz][osx-arm64-targz-8.0.1XX-preview1] - [Checksum][osx-arm64-targz-checksum-8.0.1XX-preview1] | [![][osx-arm64-badge-7.0.3XX]][osx-arm64-version-7.0.3XX]
[Installer][osx-arm64-installer-7.0.3XX] - [Checksum][osx-arm64-installer-checksum-7.0.3XX]
[tar.gz][osx-arm64-targz-7.0.3XX] - [Checksum][osx-arm64-targz-checksum-7.0.3XX] | -| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-8.0.1XX-preview1]][linux-version-8.0.1XX-preview1]
[DEB Installer][linux-DEB-installer-8.0.1XX-preview1] - [Checksum][linux-DEB-installer-checksum-8.0.1XX-preview1]
[RPM Installer][linux-RPM-installer-8.0.1XX-preview1] - [Checksum][linux-RPM-installer-checksum-8.0.1XX-preview1]
_see installer note below_1
[tar.gz][linux-targz-8.0.1XX-preview1] - [Checksum][linux-targz-checksum-8.0.1XX-preview1] | [![][linux-badge-7.0.3XX]][linux-version-7.0.3XX]
[DEB Installer][linux-DEB-installer-7.0.3XX] - [Checksum][linux-DEB-installer-checksum-7.0.3XX]
[RPM Installer][linux-RPM-installer-7.0.3XX] - [Checksum][linux-RPM-installer-checksum-7.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.3XX] - [Checksum][linux-targz-checksum-7.0.3XX] | -| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-8.0.1XX-preview1]][linux-arm-version-8.0.1XX-preview1]
[tar.gz][linux-arm-targz-8.0.1XX-preview1] - [Checksum][linux-arm-targz-checksum-8.0.1XX-preview1] | [![][linux-arm-badge-7.0.3XX]][linux-arm-version-7.0.3XX]
[tar.gz][linux-arm-targz-7.0.3XX] - [Checksum][linux-arm-targz-checksum-7.0.3XX] | -| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-8.0.1XX-preview1]][linux-arm64-version-8.0.1XX-preview1]
[tar.gz][linux-arm64-targz-8.0.1XX-preview1] - [Checksum][linux-arm64-targz-checksum-8.0.1XX-preview1] | [![][linux-arm64-badge-7.0.3XX]][linux-arm64-version-7.0.3XX]
[tar.gz][linux-arm64-targz-7.0.3XX] - [Checksum][linux-arm64-targz-checksum-7.0.3XX] | -| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-8.0.1XX-preview1]][linux-musl-x64-version-8.0.1XX-preview1]
[tar.gz][linux-musl-x64-targz-8.0.1XX-preview1] - [Checksum][linux-musl-x64-targz-checksum-8.0.1XX-preview1] | [![][linux-musl-x64-badge-7.0.3XX]][linux-musl-x64-version-7.0.3XX]
[tar.gz][linux-musl-x64-targz-7.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.3XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-8.0.1XX-preview1]][linux-musl-arm-version-8.0.1XX-preview1]
[tar.gz][linux-musl-arm-targz-8.0.1XX-preview1] - [Checksum][linux-musl-arm-targz-checksum-8.0.1XX-preview1] | [![][linux-musl-arm-badge-7.0.3XX]][linux-musl-arm-version-7.0.3XX]
[tar.gz][linux-musl-arm-targz-7.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.3XX] | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-8.0.1XX-preview1]][linux-musl-arm64-version-8.0.1XX-preview1]
[tar.gz][linux-musl-arm64-targz-8.0.1XX-preview1] - [Checksum][linux-musl-arm64-targz-checksum-8.0.1XX-preview1] | [![][linux-musl-arm64-badge-7.0.3XX]][linux-musl-arm64-version-7.0.3XX]
[tar.gz][linux-musl-arm64-targz-7.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.3XX] | +| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-8.0.1XX-preview2]][win-arm64-version-8.0.1XX-preview2]
[Installer][win-arm64-installer-8.0.1XX-preview2] - [Checksum][win-arm64-installer-checksum-8.0.1XX-preview2]
[zip][win-arm64-zip-8.0.1XX-preview2] | [![][win-arm64-badge-7.0.3XX]][win-arm64-version-7.0.3XX]
[Installer][win-arm64-installer-7.0.3XX] - [Checksum][win-arm64-installer-checksum-7.0.3XX]
[zip][win-arm64-zip-7.0.3XX] | +| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-8.0.1XX-preview2]][osx-x64-version-8.0.1XX-preview2]
[Installer][osx-x64-installer-8.0.1XX-preview2] - [Checksum][osx-x64-installer-checksum-8.0.1XX-preview2]
[tar.gz][osx-x64-targz-8.0.1XX-preview2] - [Checksum][osx-x64-targz-checksum-8.0.1XX-preview2] | [![][osx-x64-badge-7.0.3XX]][osx-x64-version-7.0.3XX]
[Installer][osx-x64-installer-7.0.3XX] - [Checksum][osx-x64-installer-checksum-7.0.3XX]
[tar.gz][osx-x64-targz-7.0.3XX] - [Checksum][osx-x64-targz-checksum-7.0.3XX] | +| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-8.0.1XX-preview2]][osx-arm64-version-8.0.1XX-preview2]
[Installer][osx-arm64-installer-8.0.1XX-preview2] - [Checksum][osx-arm64-installer-checksum-8.0.1XX-preview2]
[tar.gz][osx-arm64-targz-8.0.1XX-preview2] - [Checksum][osx-arm64-targz-checksum-8.0.1XX-preview2] | [![][osx-arm64-badge-7.0.3XX]][osx-arm64-version-7.0.3XX]
[Installer][osx-arm64-installer-7.0.3XX] - [Checksum][osx-arm64-installer-checksum-7.0.3XX]
[tar.gz][osx-arm64-targz-7.0.3XX] - [Checksum][osx-arm64-targz-checksum-7.0.3XX] | +| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-8.0.1XX-preview2]][linux-version-8.0.1XX-preview2]
[DEB Installer][linux-DEB-installer-8.0.1XX-preview2] - [Checksum][linux-DEB-installer-checksum-8.0.1XX-preview2]
[RPM Installer][linux-RPM-installer-8.0.1XX-preview2] - [Checksum][linux-RPM-installer-checksum-8.0.1XX-preview2]
_see installer note below_1
[tar.gz][linux-targz-8.0.1XX-preview2] - [Checksum][linux-targz-checksum-8.0.1XX-preview2] | [![][linux-badge-7.0.3XX]][linux-version-7.0.3XX]
[DEB Installer][linux-DEB-installer-7.0.3XX] - [Checksum][linux-DEB-installer-checksum-7.0.3XX]
[RPM Installer][linux-RPM-installer-7.0.3XX] - [Checksum][linux-RPM-installer-checksum-7.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.3XX] - [Checksum][linux-targz-checksum-7.0.3XX] | +| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-8.0.1XX-preview2]][linux-arm-version-8.0.1XX-preview2]
[tar.gz][linux-arm-targz-8.0.1XX-preview2] - [Checksum][linux-arm-targz-checksum-8.0.1XX-preview2] | [![][linux-arm-badge-7.0.3XX]][linux-arm-version-7.0.3XX]
[tar.gz][linux-arm-targz-7.0.3XX] - [Checksum][linux-arm-targz-checksum-7.0.3XX] | +| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-8.0.1XX-preview2]][linux-arm64-version-8.0.1XX-preview2]
[tar.gz][linux-arm64-targz-8.0.1XX-preview2] - [Checksum][linux-arm64-targz-checksum-8.0.1XX-preview2] | [![][linux-arm64-badge-7.0.3XX]][linux-arm64-version-7.0.3XX]
[tar.gz][linux-arm64-targz-7.0.3XX] - [Checksum][linux-arm64-targz-checksum-7.0.3XX] | +| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-8.0.1XX-preview2]][linux-musl-x64-version-8.0.1XX-preview2]
[tar.gz][linux-musl-x64-targz-8.0.1XX-preview2] - [Checksum][linux-musl-x64-targz-checksum-8.0.1XX-preview2] | [![][linux-musl-x64-badge-7.0.3XX]][linux-musl-x64-version-7.0.3XX]
[tar.gz][linux-musl-x64-targz-7.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.3XX] | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-8.0.1XX-preview2]][linux-musl-arm-version-8.0.1XX-preview2]
[tar.gz][linux-musl-arm-targz-8.0.1XX-preview2] - [Checksum][linux-musl-arm-targz-checksum-8.0.1XX-preview2] | [![][linux-musl-arm-badge-7.0.3XX]][linux-musl-arm-version-7.0.3XX]
[tar.gz][linux-musl-arm-targz-7.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.3XX] | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-8.0.1XX-preview2]][linux-musl-arm64-version-8.0.1XX-preview2]
[tar.gz][linux-musl-arm64-targz-8.0.1XX-preview2] - [Checksum][linux-musl-arm64-targz-checksum-8.0.1XX-preview2] | [![][linux-musl-arm64-badge-7.0.3XX]][linux-musl-arm64-version-7.0.3XX]
[tar.gz][linux-musl-arm64-targz-7.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.3XX] | | **RHEL 6** | **N/A** | **N/A** | **N/A** | Reference notes: @@ -192,12 +192,12 @@ Reference notes: [win-x64-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x64.zip [win-x64-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x64.zip.sha -[win-x64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/win_x64_Release_version_badge.svg?no-cache -[win-x64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-win-x64.txt -[win-x64-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x64.exe -[win-x64-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x64.exe.sha -[win-x64-zip-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x64.zip -[win-x64-zip-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x64.zip.sha +[win-x64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_x64_Release_version_badge.svg?no-cache +[win-x64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-x64.txt +[win-x64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.exe +[win-x64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.exe.sha +[win-x64-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.zip +[win-x64-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.zip.sha [win-x64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_x64_Release_version_badge.svg?no-cache [win-x64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-x64.txt @@ -213,12 +213,12 @@ Reference notes: [win-x86-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x86.zip [win-x86-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x86.zip.sha -[win-x86-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/win_x86_Release_version_badge.svg?no-cache -[win-x86-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-win-x86.txt -[win-x86-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x86.exe -[win-x86-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x86.exe.sha -[win-x86-zip-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x86.zip -[win-x86-zip-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-x86.zip.sha +[win-x86-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_x86_Release_version_badge.svg?no-cache +[win-x86-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-x86.txt +[win-x86-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.exe +[win-x86-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.exe.sha +[win-x86-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.zip +[win-x86-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.zip.sha [win-x86-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_x86_Release_version_badge.svg?no-cache [win-x86-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-x86.txt @@ -234,12 +234,12 @@ Reference notes: [osx-x64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz [osx-x64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha -[osx-x64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/osx_x64_Release_version_badge.svg?no-cache -[osx-x64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-osx-x64.txt -[osx-x64-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg -[osx-x64-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg.sha -[osx-x64-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-x64.tar.gz -[osx-x64-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha +[osx-x64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/osx_x64_Release_version_badge.svg?no-cache +[osx-x64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-osx-x64.txt +[osx-x64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg +[osx-x64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg.sha +[osx-x64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.tar.gz +[osx-x64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha [osx-x64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/osx_x64_Release_version_badge.svg?no-cache [osx-x64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-osx-x64.txt @@ -255,12 +255,12 @@ Reference notes: [osx-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz [osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha -[osx-arm64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/osx_arm64_Release_version_badge.svg?no-cache -[osx-arm64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-osx-arm64.txt -[osx-arm64-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg -[osx-arm64-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg.sha -[osx-arm64-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.tar.gz -[osx-arm64-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha +[osx-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/osx_arm64_Release_version_badge.svg?no-cache +[osx-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-osx-arm64.txt +[osx-arm64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg +[osx-arm64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg.sha +[osx-arm64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.tar.gz +[osx-arm64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha [osx-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/osx_arm64_Release_version_badge.svg?no-cache [osx-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-osx-arm64.txt @@ -278,14 +278,14 @@ Reference notes: [linux-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz [linux-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha -[linux-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/linux_x64_Release_version_badge.svg?no-cache -[linux-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-linux-x64.txt -[linux-DEB-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-x64.deb -[linux-DEB-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-x64.deb.sha -[linux-RPM-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-x64.rpm -[linux-RPM-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-x64.rpm.sha -[linux-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-x64.tar.gz -[linux-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-x64.tar.gz.sha +[linux-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_x64_Release_version_badge.svg?no-cache +[linux-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-x64.txt +[linux-DEB-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.deb +[linux-DEB-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.deb.sha +[linux-RPM-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.rpm +[linux-RPM-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.rpm.sha +[linux-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-x64.tar.gz +[linux-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-x64.tar.gz.sha [linux-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_x64_Release_version_badge.svg?no-cache [linux-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-x64.txt @@ -301,10 +301,10 @@ Reference notes: [linux-arm-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz [linux-arm-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha -[linux-arm-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/linux_arm_Release_version_badge.svg?no-cache -[linux-arm-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-linux-arm.txt -[linux-arm-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-arm.tar.gz -[linux-arm-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-arm.tar.gz.sha +[linux-arm-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_arm_Release_version_badge.svg?no-cache +[linux-arm-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-arm.txt +[linux-arm-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm.tar.gz +[linux-arm-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm.tar.gz.sha [linux-arm-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_arm_Release_version_badge.svg?no-cache [linux-arm-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-arm.txt @@ -316,10 +316,10 @@ Reference notes: [linux-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz [linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha -[linux-arm64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/linux_arm64_Release_version_badge.svg?no-cache -[linux-arm64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-linux-arm64.txt -[linux-arm64-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-arm64.tar.gz -[linux-arm64-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-arm64.tar.gz.sha +[linux-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_arm64_Release_version_badge.svg?no-cache +[linux-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-arm64.txt +[linux-arm64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm64.tar.gz +[linux-arm64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm64.tar.gz.sha [linux-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_arm64_Release_version_badge.svg?no-cache [linux-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-arm64.txt @@ -331,10 +331,10 @@ Reference notes: [rhel-6-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz [rhel-6-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha -[rhel-6-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/rhel.6_x64_Release_version_badge.svg?no-cache -[rhel-6-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-rhel.6-x64.txt -[rhel-6-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-rhel.6-x64.tar.gz -[rhel-6-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha +[rhel-6-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/rhel.6_x64_Release_version_badge.svg?no-cache +[rhel-6-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-rhel.6-x64.txt +[rhel-6-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha [rhel-6-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache [rhel-6-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-rhel.6-x64.txt @@ -346,10 +346,10 @@ Reference notes: [linux-musl-x64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz [linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha -[linux-musl-x64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/linux_musl_x64_Release_version_badge.svg?no-cache -[linux-musl-x64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-linux-musl-x64.txt -[linux-musl-x64-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-musl-x64.tar.gz -[linux-musl-x64-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha +[linux-musl-x64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_musl_x64_Release_version_badge.svg?no-cache +[linux-musl-x64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-musl-x64.txt +[linux-musl-x64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-x64.tar.gz +[linux-musl-x64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha [linux-musl-x64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache [linux-musl-x64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-musl-x64.txt @@ -361,10 +361,10 @@ Reference notes: [linux-musl-arm-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha -[linux-musl-arm-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/linux_musl_arm_Release_version_badge.svg?no-cache -[linux-musl-arm-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-linux-musl-arm.txt -[linux-musl-arm-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm.tar.gz -[linux-musl-arm-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_musl_arm_Release_version_badge.svg?no-cache +[linux-musl-arm-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha [linux-musl-arm-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_musl_arm_Release_version_badge.svg?no-cache [linux-musl-arm-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-musl-arm.txt @@ -376,10 +376,10 @@ Reference notes: [linux-musl-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha -[linux-musl-arm64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/linux_musl_arm64_Release_version_badge.svg?no-cache -[linux-musl-arm64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-linux-musl-arm64.txt -[linux-musl-arm64-targz-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm64.tar.gz -[linux-musl-arm64-targz-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_musl_arm64_Release_version_badge.svg?no-cache +[linux-musl-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha [linux-musl-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_musl_arm64_Release_version_badge.svg?no-cache [linux-musl-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-musl-arm64.txt @@ -391,10 +391,10 @@ Reference notes: [win-arm-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm.zip [win-arm-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm.zip.sha -[win-arm-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/win_arm_Release_version_badge.svg?no-cache -[win-arm-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-win-arm.txt -[win-arm-zip-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-arm.zip -[win-arm-zip-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-arm.zip.sha +[win-arm-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_arm_Release_version_badge.svg?no-cache +[win-arm-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-arm.txt +[win-arm-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm.zip +[win-arm-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm.zip.sha [win-arm-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_arm_Release_version_badge.svg?no-cache [win-arm-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-arm.txt @@ -408,12 +408,12 @@ Reference notes: [win-arm64-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm64.zip [win-arm64-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha -[win-arm64-badge-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/win_arm64_Release_version_badge.svg?no-cache -[win-arm64-version-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/productCommit-win-arm64.txt -[win-arm64-installer-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-arm64.exe -[win-arm64-installer-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-arm64.exe.sha -[win-arm64-zip-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-arm64.zip -[win-arm64-zip-checksum-8.0.1XX-preview1]: https://aka.ms/dotnet/8.0.1xx-preview1/daily/dotnet-sdk-win-arm64.zip.sha +[win-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_arm64_Release_version_badge.svg?no-cache +[win-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-arm64.txt +[win-arm64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.exe +[win-arm64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.exe.sha +[win-arm64-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.zip +[win-arm64-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.zip.sha [win-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_arm64_Release_version_badge.svg?no-cache [win-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-arm64.txt From e9aced5597f765a663ef37eecf32a805229b6853 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 23:50:25 +0000 Subject: [PATCH 343/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.13 -> To Version 7.0.300-preview.23124.16 --- 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 9dd5bae5a..9b30e1379 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b - + https://github.com/dotnet/sdk - 71f20e519f052f85443e1a0f36f70b1dc6ffb67a + 5872c043f6e6cd114fd9fa0d4ba729200962df5b diff --git a/eng/Versions.props b/eng/Versions.props index b7f899038..e6d9384fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.13 - 7.0.300-preview.23124.13 - 7.0.300-preview.23124.13 + 7.0.300-preview.23124.16 + 7.0.300-preview.23124.16 + 7.0.300-preview.23124.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a1fdb50445056b3ec4e1847c7de2d9c298a2e4be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 01:06:25 +0000 Subject: [PATCH 344/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.13 -> To Version 7.0.300-preview.23124.19 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23124.1 -> To Version 4.6.0-2.23124.4 (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 9b30e1379..d8c015e26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d - + https://github.com/dotnet/sdk - 5872c043f6e6cd114fd9fa0d4ba729200962df5b + d1bcc35bacc316c0d397b4d26c9134d406940b6d @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c diff --git a/eng/Versions.props b/eng/Versions.props index e6d9384fc..e54544b94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.16 - 7.0.300-preview.23124.16 - 7.0.300-preview.23124.16 + 7.0.300-preview.23124.19 + 7.0.300-preview.23124.19 + 7.0.300-preview.23124.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc69610af915341dfcb759812ed46acc00e36ae4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:07:40 +0000 Subject: [PATCH 345/864] [main] Update dependencies from dotnet/sdk (#15636) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.2.23123.5 to 8.0.0-preview.2.23124.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-2.23124.1 to 4.6.0-2.23124.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.2.23124.1 to 8.0.0-preview.2.23124.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caba687f0..d6cff0f02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 12209f087e1c0256db8b08e7e7217f7526628d8b + a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 - + https://github.com/dotnet/sdk - 12209f087e1c0256db8b08e7e7217f7526628d8b + a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 - + https://github.com/dotnet/sdk - 12209f087e1c0256db8b08e7e7217f7526628d8b + a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 - + https://github.com/dotnet/sdk - 12209f087e1c0256db8b08e7e7217f7526628d8b + a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 @@ -142,13 +142,13 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 3f192dc39715a87c827ed97b0573d860b6f14ac0 diff --git a/eng/Versions.props b/eng/Versions.props index 5d12f5558..cd39d55cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,38 +58,38 @@ - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 0.2.0 - 8.0.100-preview.2.23124.14 - 8.0.100-preview.2.23124.14 - 8.0.100-preview.2.23124.14 + 8.0.100-preview.3.23124.18 + 8.0.100-preview.3.23124.18 + 8.0.100-preview.3.23124.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 2.1.0 From 23963bde2fbf8a78c610a85040cabe440676dc6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 02:41:48 +0000 Subject: [PATCH 346/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23124.18 -> To Version 8.0.100-preview.3.23124.20 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.2.23124.5 -> To Version 8.0.0-preview.2.23124.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6cff0f02..fc091c1ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 + 8e05b6666056a3db9911799205fbdf9e12e3ba10 - + https://github.com/dotnet/sdk - a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 + 8e05b6666056a3db9911799205fbdf9e12e3ba10 - + https://github.com/dotnet/sdk - a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 + 8e05b6666056a3db9911799205fbdf9e12e3ba10 - + https://github.com/dotnet/sdk - a76a0ccd0d6ab74dd6ec63002f7fd16085e11659 + 8e05b6666056a3db9911799205fbdf9e12e3ba10 diff --git a/eng/Versions.props b/eng/Versions.props index cd39d55cb..03c45c0ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 0.2.0 - 8.0.100-preview.3.23124.18 - 8.0.100-preview.3.23124.18 - 8.0.100-preview.3.23124.18 + 8.0.100-preview.3.23124.20 + 8.0.100-preview.3.23124.20 + 8.0.100-preview.3.23124.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 812268eebe981240acd6c35ab34cd4f8c94e315f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 04:33:44 +0000 Subject: [PATCH 347/864] Update dependencies from https://github.com/dotnet/sdk build 20230224.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23124.18 -> To Version 8.0.100-preview.3.23124.21 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23124.2 -> To Version 8.0.0-preview.2.23124.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc091c1ac..9cdd15e4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8e05b6666056a3db9911799205fbdf9e12e3ba10 + ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 - + https://github.com/dotnet/sdk - 8e05b6666056a3db9911799205fbdf9e12e3ba10 + ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 - + https://github.com/dotnet/sdk - 8e05b6666056a3db9911799205fbdf9e12e3ba10 + ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 - + https://github.com/dotnet/sdk - 8e05b6666056a3db9911799205fbdf9e12e3ba10 + ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 03c45c0ca..8981f13f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23124.20 - 8.0.100-preview.3.23124.20 - 8.0.100-preview.3.23124.20 + 8.0.100-preview.3.23124.21 + 8.0.100-preview.3.23124.21 + 8.0.100-preview.3.23124.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 2.1.0 From 4336699609b33de57897c304dc41233b9f32d8c9 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Sun, 26 Feb 2023 16:26:19 +0000 Subject: [PATCH 348/864] Enable SDK diff exclusions --- .../SdkContentTests.cs | 27 +++++++++++++++++++ .../assets/SdkDiffExclusions.txt | 17 ++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index ef462619a..eb2eeb740 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.IO.Enumeration; using System.Linq; using System.Text.RegularExpressions; using Xunit.Abstractions; @@ -46,10 +47,36 @@ public class SdkContentTests : SmokeTests fileListing = BaselineHelper.RemoveRids(fileListing, isPortable); fileListing = BaselineHelper.RemoveVersions(fileListing); IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); + files = FilteredFileList( + files, + GetExclusionFilters( + Path.Combine(BaselineHelper.GetAssetsDirectory(), "SdkDiffExclusions.txt"), + tarballPath == Config.MsftSdkTarballPath ? "msft" : "sb")); File.WriteAllLines(outputFileName, files); } + private static IEnumerable FilteredFileList(IEnumerable files, IEnumerable exclusions) + { + return files + .Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item))); + } + + private static IEnumerable GetExclusionFilters(string exceptionFilePath, string sdkType) + { + var text = File.ReadAllText(exceptionFilePath); + int prefixSkip = sdkType.Length + 1; + return text.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries) + .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions + .Select(line => + { + // Ignore comments + var index = line.IndexOf('#'); + return index >= 0 ? line[prefixSkip..index].TrimEnd() : line[prefixSkip..]; + }) + .ToList(); + } + private static string RemoveDiffMarkers(string source) { Regex indexRegex = new("^index .*", RegexOptions.Multiline); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt new file mode 100644 index 000000000..a7a0e38f8 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt @@ -0,0 +1,17 @@ +# This list is processed using FileSystemName.MatchesSimpleExpression +# +# Format +# {msft|sb}, [# comment] +# msft = Microsoft built SDK +# sb = source-built SDK +# +# Examples +# 'folder/*' matches 'folder/' and 'folder/abc' +# 'folder/?*' matches 'folder/abc' but not 'folder/' +# +# We do not want to filter-out folder entries, therefore, we should use: '?*' and not just '*' + +msft,./sdk/x.y.z/TestHostNetFramework/?* # Intentional - MSFT build includes test-host that targets netcoreapp3.1 +msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/?* # Intentional - explicitly excluded from source-build +sb,./sdk/x.y.z/TestHost/?* # Intentional - source-build includes test-host that targets latest .NET TFM + From 1d8c2d93c0415677f39802a8d47c8aae7c2215a3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:00 +0000 Subject: [PATCH 349/864] Merged PR 29807: [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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (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**: 20230226.1 - **Date Produced**: February 26, 2023 10:01:39 PM UTC - **Commit**: bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.115-servicing.23120.14 to 6.0.115-servicing.23126.1][1] - **Microsoft.NET.Sdk**: [from 6.0.115-servicing.23120.14 to 6.0.115-servicing.23126.1][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfc573c3&targetVersion=GCbb0cd5e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac5080f79..a118686fa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,12 @@ - + + + @@ -19,9 +21,13 @@ + + + + @@ -42,16 +48,20 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 734e2f51a..e406a8031 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc573c39acc28d9287e7aa638bd837922777e1b0 + bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc573c39acc28d9287e7aa638bd837922777e1b0 + bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 diff --git a/eng/Versions.props b/eng/Versions.props index 5cab77811..13223f90d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 0.2.0 - 6.0.115-servicing.23120.14 - 6.0.115-servicing.23120.14 + 6.0.115-servicing.23126.1 + 6.0.115-servicing.23126.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99a8aa0f90564eefc820dc45d1845fb6bd6dd282 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:05 +0000 Subject: [PATCH 350/864] Merged PR 29809: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230226.2 - **Date Produced**: February 26, 2023 10:02:37 PM UTC - **Commit**: 9377719841f99261e56cca96905da8568de079c6 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.310-servicing.23121.6 to 6.0.310-servicing.23126.2][1] - **Microsoft.NET.Sdk**: [from 6.0.310-servicing.23121.6 to 6.0.310-servicing.23126.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC184bce9&targetVersion=GC9377719&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad8d3a8fe..37ac3d356 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,9 +18,13 @@ + + + + @@ -41,14 +45,18 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edac2458b..b5d1517d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d514aa078b709344008f1c595e854b9b56609cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 184bce99f0edbee2a6334f366c21980931bbed5f + 9377719841f99261e56cca96905da8568de079c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 184bce99f0edbee2a6334f366c21980931bbed5f + 9377719841f99261e56cca96905da8568de079c6 diff --git a/eng/Versions.props b/eng/Versions.props index a634b03ab..bc4d421d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 0.2.0 - 6.0.310-servicing.23121.6 - 6.0.310-servicing.23121.6 + 6.0.310-servicing.23126.2 + 6.0.310-servicing.23126.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8659ea151969e597785b032f243b7a537c620c1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:10 +0000 Subject: [PATCH 351/864] Merged PR 29808: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230226.3 - **Date Produced**: February 26, 2023 10:02:39 PM UTC - **Commit**: 6f7588fcd6922febeacca723a71b403edb9f4bdf - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23120.11 to 6.0.407-servicing.23126.3][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23120.11 to 6.0.407-servicing.23126.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC91af9ad&targetVersion=GC6f7588f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1357fac19..bbd67aded 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,6 +20,8 @@ + + @@ -40,7 +42,7 @@ - + @@ -48,6 +50,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01c76cd8a..e926e9ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91af9ad334715d23c1382f71ccee9f45a501a70e + 6f7588fcd6922febeacca723a71b403edb9f4bdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91af9ad334715d23c1382f71ccee9f45a501a70e + 6f7588fcd6922febeacca723a71b403edb9f4bdf diff --git a/eng/Versions.props b/eng/Versions.props index 2b36b3b13..c1a331018 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 0.2.0 - 6.0.407-servicing.23120.11 - 6.0.407-servicing.23120.11 + 6.0.407-servicing.23126.3 + 6.0.407-servicing.23126.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8514f0cffde6a52f05b881ac7dd7aa2d83301c92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 03:36:04 +0000 Subject: [PATCH 352/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.19 -> To Version 7.0.300-preview.23126.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23124.4 -> To Version 4.6.0-2.23126.2 (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 d8c015e26..088247cb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b - + https://github.com/dotnet/sdk - d1bcc35bacc316c0d397b4d26c9134d406940b6d + beb0421e5c0f0b9db7274bf679ad5b21a51c145b @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 diff --git a/eng/Versions.props b/eng/Versions.props index e54544b94..9614e0ed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23124.19 - 7.0.300-preview.23124.19 - 7.0.300-preview.23124.19 + 7.0.300-preview.23126.5 + 7.0.300-preview.23126.5 + 7.0.300-preview.23126.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 693fc47d2807e1fdff60d3b424cb2a41a4f64f9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 04:05:39 +0000 Subject: [PATCH 353/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23124.21 -> To Version 8.0.100-preview.3.23126.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23126.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++-------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cdd15e4e..00452f07e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 1455112d473a235ae6558da1c62b215531578801 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 + 5876bd468f1b3ef7871cb5171699ee8737505618 - + https://github.com/dotnet/sdk - ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 + 5876bd468f1b3ef7871cb5171699ee8737505618 - + https://github.com/dotnet/sdk - ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 + 5876bd468f1b3ef7871cb5171699ee8737505618 - + https://github.com/dotnet/sdk - ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 + 5876bd468f1b3ef7871cb5171699ee8737505618 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc @@ -142,18 +142,18 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 https://github.com/dotnet/roslyn 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be diff --git a/eng/Versions.props b/eng/Versions.props index 8981f13f4..c5fccca01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,38 +58,38 @@ - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 0.2.0 - 8.0.100-preview.3.23124.21 - 8.0.100-preview.3.23124.21 - 8.0.100-preview.3.23124.21 + 8.0.100-preview.3.23126.4 + 8.0.100-preview.3.23126.4 + 8.0.100-preview.3.23126.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 2.1.0 From d6838673af5f90aa939158e4baf5bc05241f1dba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 04:53:28 +0000 Subject: [PATCH 354/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23124.19 -> To Version 7.0.300-preview.23126.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23123.3 -> To Version 12.5.0-beta.23124.3 (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 088247cb6..101d9b948 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c - + https://github.com/dotnet/sdk - beb0421e5c0f0b9db7274bf679ad5b21a51c145b + 131f6c4dac6b60526a84183056e5f38f71f0b72c @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc diff --git a/eng/Versions.props b/eng/Versions.props index 9614e0ed1..ee8755145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23126.5 - 7.0.300-preview.23126.5 - 7.0.300-preview.23126.5 + 7.0.300-preview.23126.6 + 7.0.300-preview.23126.6 + 7.0.300-preview.23126.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc0ca100df6fa62682ea7e88246e026b4a3a04da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 05:13:25 +0000 Subject: [PATCH 355/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23124.21 -> To Version 8.0.100-preview.3.23126.7 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23126.2 (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 00452f07e..76582ba01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5876bd468f1b3ef7871cb5171699ee8737505618 + f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 - + https://github.com/dotnet/sdk - 5876bd468f1b3ef7871cb5171699ee8737505618 + f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 - + https://github.com/dotnet/sdk - 5876bd468f1b3ef7871cb5171699ee8737505618 + f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 - + https://github.com/dotnet/sdk - 5876bd468f1b3ef7871cb5171699ee8737505618 + f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 diff --git a/eng/Versions.props b/eng/Versions.props index c5fccca01..29760eb07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23126.4 - 8.0.100-preview.3.23126.4 - 8.0.100-preview.3.23126.4 + 8.0.100-preview.3.23126.7 + 8.0.100-preview.3.23126.7 + 8.0.100-preview.3.23126.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 582fe0f4ea373dad3206894d54cbe7298792e1f2 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 27 Feb 2023 06:28:23 +0000 Subject: [PATCH 356/864] Update baseline --- .../assets/baselines/MsftToSbSdk.diff | 337 ------------------ 1 file changed, 337 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 3300d8daf..1ee13e55e 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -895,86 +895,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/Microsoft.NET.Sdk.Web.Tasks.dll -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.WinFX.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/System.Windows.Forms.Analyzers.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/THIRD-PARTY-NOTICES.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Collections.Immutable.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Reflection.Metadata.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/version.txt ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props @@ -1106,245 +1026,6 @@ index ------------ ./sdk/x.y.z/testhost.deps.json ./sdk/x.y.z/testhost.dll -./sdk/x.y.z/TestHostNetFramework/ --./sdk/x.y.z/TestHostNetFramework/cs/ --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/datacollector.arm64.exe --./sdk/x.y.z/TestHostNetFramework/datacollector.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/datacollector.exe --./sdk/x.y.z/TestHostNetFramework/datacollector.exe.config --./sdk/x.y.z/TestHostNetFramework/de/ --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/ --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/ --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/ --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/ --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/ --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CommunicationUtilities.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CoreUtilities.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CrossPlatEngine.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.PlatformAbstractions.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.Utilities.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.VisualStudio.TestPlatform.Common.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.Win32.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/netstandard.dll --./sdk/x.y.z/TestHostNetFramework/Newtonsoft.Json.dll --./sdk/x.y.z/TestHostNetFramework/NuGet.Frameworks.dll --./sdk/x.y.z/TestHostNetFramework/pl/ --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/ --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/ --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/System.AppContext.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.Concurrent.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.Immutable.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.NonGeneric.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.Specialized.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.EventBasedAsync.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.TypeConverter.dll --./sdk/x.y.z/TestHostNetFramework/System.Console.dll --./sdk/x.y.z/TestHostNetFramework/System.Data.Common.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Contracts.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Debug.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.FileVersionInfo.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Process.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.StackTrace.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.TextWriterTraceListener.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Tools.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.TraceSource.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Tracing.dll --./sdk/x.y.z/TestHostNetFramework/System.Drawing.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Dynamic.Runtime.dll --./sdk/x.y.z/TestHostNetFramework/System.Globalization.Calendars.dll --./sdk/x.y.z/TestHostNetFramework/System.Globalization.dll --./sdk/x.y.z/TestHostNetFramework/System.Globalization.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.Compression.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.Compression.ZipFile.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.DriveInfo.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.Watcher.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.IsolatedStorage.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.MemoryMappedFiles.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.Pipes.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.UnmanagedMemoryStream.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.Expressions.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.Parallel.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.Queryable.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Http.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.NameResolution.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.NetworkInformation.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Ping.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Requests.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Security.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Sockets.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.WebHeaderCollection.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.WebSockets.Client.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.WebSockets.dll --./sdk/x.y.z/TestHostNetFramework/System.ObjectModel.dll --./sdk/x.y.z/TestHostNetFramework/System.Private.Uri.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.Metadata.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Resources.Reader.dll --./sdk/x.y.z/TestHostNetFramework/System.Resources.ResourceManager.dll --./sdk/x.y.z/TestHostNetFramework/System.Resources.Writer.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.CompilerServices.VisualC.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Handles.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.InteropServices.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.InteropServices.RuntimeInformation.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Numerics.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Formatters.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Json.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Xml.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Claims.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Algorithms.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Csp.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Encoding.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.X509Certificates.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Principal.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.SecureString.dll --./sdk/x.y.z/TestHostNetFramework/System.Text.Encoding.dll --./sdk/x.y.z/TestHostNetFramework/System.Text.Encoding.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.Text.RegularExpressions.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Overlapped.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Tasks.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Tasks.Parallel.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Thread.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.ThreadPool.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Timer.dll --./sdk/x.y.z/TestHostNetFramework/System.ValueTuple.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.ReaderWriter.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XDocument.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XmlDocument.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XmlSerializer.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XPath.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XPath.XDocument.dll --./sdk/x.y.z/TestHostNetFramework/testhost.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.exe --./sdk/x.y.z/TestHostNetFramework/testhost.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net47.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net47.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net47.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net47.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net47.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net47.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net471.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net471.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net471.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net471.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net471.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net471.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net472.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net472.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net472.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net472.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net472.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net472.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net48.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net48.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net48.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net48.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net48.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net48.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/tr/ --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/x64/ --./sdk/x.y.z/TestHostNetFramework/x64/msdia140.dll --./sdk/x.y.z/TestHostNetFramework/x64/msdia140.dll.manifest --./sdk/x.y.z/TestHostNetFramework/x86/ --./sdk/x.y.z/TestHostNetFramework/x86/msdia140.dll --./sdk/x.y.z/TestHostNetFramework/x86/msdia140.dll.manifest --./sdk/x.y.z/TestHostNetFramework/zh-Hans/ --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/ --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +./sdk/x.y.z/testhost.dll.config +./sdk/x.y.z/testhost.runtimeconfig.json +./sdk/x.y.z/testhost.x86 @@ -1353,24 +1034,6 @@ index ------------ +./sdk/x.y.z/testhost.x86.dll.config +./sdk/x.y.z/testhost.x86.runtimeconfig.json +./sdk/x.y.z/TestHost/ -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.PlatformAbstractions.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll -+./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll -+./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll -+./sdk/x.y.z/TestHost/Newtonsoft.Json.dll -+./sdk/x.y.z/TestHost/NuGet.Frameworks.dll -+./sdk/x.y.z/TestHost/testhost.deps.json -+./sdk/x.y.z/TestHost/testhost.dll -+./sdk/x.y.z/TestHost/testhost.dll.config -+./sdk/x.y.z/TestHost/testhost.runtimeconfig.json -+./sdk/x.y.z/TestHost/testhost.x86 -+./sdk/x.y.z/TestHost/testhost.x86.deps.json -+./sdk/x.y.z/TestHost/testhost.x86.dll -+./sdk/x.y.z/TestHost/testhost.x86.dll.config -+./sdk/x.y.z/TestHost/testhost.x86.runtimeconfig.json ./sdk/x.y.z/tr/ ./sdk/x.y.z/tr/dotnet.resources.dll -./sdk/x.y.z/tr/Microsoft.Build.NuGetSdkResolver.resources.dll From 0704bc3b397cae0b5771cb18437b59677ed14011 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 06:35:59 +0000 Subject: [PATCH 357/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23124.21 -> To Version 8.0.100-preview.3.23126.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23123.1 -> To Version 8.0.0-preview.2.23125.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76582ba01..26fbeead8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + b587906c2964aaefab5fbd7a27af5fbc59120a4e https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 + 49b3b3c6528caf868623c4095bfc893e519f146a - + https://github.com/dotnet/sdk - f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 + 49b3b3c6528caf868623c4095bfc893e519f146a - + https://github.com/dotnet/sdk - f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 + 49b3b3c6528caf868623c4095bfc893e519f146a - + https://github.com/dotnet/sdk - f5194a96b90b3970c2dda3ec687f6dd5a7464ed6 + 49b3b3c6528caf868623c4095bfc893e519f146a - + https://github.com/dotnet/winforms - bba30b55a0ba2a5268709b8c616dc5e2cd2dc6a8 + 9749eb0e0d1b7c992332061133974e0ca6ba6453 - + https://github.com/dotnet/wpf - 6b67a31bca9cf848bb246895e046229dfb36bacc + 71ca704b43ee711d5808e71be88c67e18e99eea0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 29760eb07..bb1296fa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.2.23122.1 + 8.0.0-preview.3.23124.8 - 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23124.2 @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23126.7 - 8.0.100-preview.3.23126.7 - 8.0.100-preview.3.23126.7 + 8.0.100-preview.3.23126.9 + 8.0.100-preview.3.23126.9 + 8.0.100-preview.3.23126.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 From 676d174833089a7ee232d0535c968ec7e90bce42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 06:54:11 +0000 Subject: [PATCH 358/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23126.6 -> To Version 7.0.300-preview.23126.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23124.3 -> To Version 12.5.0-beta.23126.1 (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 101d9b948..c6cde5faf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa - + https://github.com/dotnet/sdk - 131f6c4dac6b60526a84183056e5f38f71f0b72c + 3c28e76fd7d1463c7eeede4becafe7f6487b64aa @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 69e9a985b80c41e7d9d589e58b75a004831c07bc + 4de2393866be1be6fa35af544c6f25a10af5ab3d - + https://github.com/dotnet/fsharp - 69e9a985b80c41e7d9d589e58b75a004831c07bc + 4de2393866be1be6fa35af544c6f25a10af5ab3d @@ -149,9 +149,9 @@ 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/msbuild - d434c0e464ee0c119bdd5ee87b448e16fe0786be + 49c7a8cf6dc7425ae3205cbb4e5babe15b72c005 diff --git a/eng/Versions.props b/eng/Versions.props index ee8755145..f1c223e1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23126.6 - 7.0.300-preview.23126.6 - 7.0.300-preview.23126.6 + 7.0.300-preview.23126.8 + 7.0.300-preview.23126.8 + 7.0.300-preview.23126.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18151fab6ffc0bc53e05fdd0a356da4ff78d0cca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 08:24:23 +0000 Subject: [PATCH 359/864] Update dependencies from https://github.com/dotnet/sdk build 20230226.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23126.9 -> To Version 8.0.100-preview.3.23126.10 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23126.2 -> To Version 8.0.0-preview.2.23126.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26fbeead8..6aa3dba94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 49b3b3c6528caf868623c4095bfc893e519f146a + 8a2f9046e3c22a96dd9952a12f87f518d2634f54 - + https://github.com/dotnet/sdk - 49b3b3c6528caf868623c4095bfc893e519f146a + 8a2f9046e3c22a96dd9952a12f87f518d2634f54 - + https://github.com/dotnet/sdk - 49b3b3c6528caf868623c4095bfc893e519f146a + 8a2f9046e3c22a96dd9952a12f87f518d2634f54 - + https://github.com/dotnet/sdk - 49b3b3c6528caf868623c4095bfc893e519f146a + 8a2f9046e3c22a96dd9952a12f87f518d2634f54 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 48daf2e9f..e33dd882e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,38 +58,38 @@ - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 0.2.0 - 8.0.100-preview.3.23126.9 - 8.0.100-preview.3.23126.9 - 8.0.100-preview.3.23126.9 + 8.0.100-preview.3.23126.10 + 8.0.100-preview.3.23126.10 + 8.0.100-preview.3.23126.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 2.1.0 From 62b7c32c4d05a3c7b5f82630659124404db66ba8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 10:45:32 +0000 Subject: [PATCH 360/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23126.10 -> To Version 8.0.100-preview.3.23127.1 --- 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 6aa3dba94..808a06ab9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8a2f9046e3c22a96dd9952a12f87f518d2634f54 + a017b3e49ed865d468a45277f968e4d4bb4d9d24 - + https://github.com/dotnet/sdk - 8a2f9046e3c22a96dd9952a12f87f518d2634f54 + a017b3e49ed865d468a45277f968e4d4bb4d9d24 - + https://github.com/dotnet/sdk - 8a2f9046e3c22a96dd9952a12f87f518d2634f54 + a017b3e49ed865d468a45277f968e4d4bb4d9d24 - + https://github.com/dotnet/sdk - 8a2f9046e3c22a96dd9952a12f87f518d2634f54 + a017b3e49ed865d468a45277f968e4d4bb4d9d24 diff --git a/eng/Versions.props b/eng/Versions.props index e33dd882e..4df1d4dd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23126.10 - 8.0.100-preview.3.23126.10 - 8.0.100-preview.3.23126.10 + 8.0.100-preview.3.23127.1 + 8.0.100-preview.3.23127.1 + 8.0.100-preview.3.23127.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f4630a845f62e1b1e306fb14801882eb091df50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 11:53:33 +0000 Subject: [PATCH 361/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23126.10 -> To Version 8.0.100-preview.3.23127.2 --- 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 808a06ab9..23eff89dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - a017b3e49ed865d468a45277f968e4d4bb4d9d24 + d1cabb18663f1d16fb613cb9265339ffb961441f - + https://github.com/dotnet/sdk - a017b3e49ed865d468a45277f968e4d4bb4d9d24 + d1cabb18663f1d16fb613cb9265339ffb961441f - + https://github.com/dotnet/sdk - a017b3e49ed865d468a45277f968e4d4bb4d9d24 + d1cabb18663f1d16fb613cb9265339ffb961441f - + https://github.com/dotnet/sdk - a017b3e49ed865d468a45277f968e4d4bb4d9d24 + d1cabb18663f1d16fb613cb9265339ffb961441f diff --git a/eng/Versions.props b/eng/Versions.props index 4df1d4dd6..8e1dcf077 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23127.1 - 8.0.100-preview.3.23127.1 - 8.0.100-preview.3.23127.1 + 8.0.100-preview.3.23127.2 + 8.0.100-preview.3.23127.2 + 8.0.100-preview.3.23127.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c294a932ff546eff1a216a0a292ed192bcd00312 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 27 Feb 2023 07:35:32 -0600 Subject: [PATCH 362/864] Re-enable WebScenarioTests (#15633) --- .../WebScenarioTests.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index f7d0a87af..56d0368f3 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -26,16 +26,15 @@ public class WebScenarioTests : SmokeTests private static IEnumerable GetScenarios() { - // TODO: Re-enable tests with https://github.com/dotnet/source-build/issues/3254 foreach (DotNetLanguage language in new[] { DotNetLanguage.CSharp, DotNetLanguage.FSharp }) { yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Web, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex); - //yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; - //yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; + yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); } yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); - //yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Angular); From eb41027856b6d48e92cdaadcd6c846c0aa6cb29f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 14:21:29 +0000 Subject: [PATCH 363/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23126.10 -> To Version 8.0.100-preview.3.23127.4 --- 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 23eff89dd..4b9f2bc85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d1cabb18663f1d16fb613cb9265339ffb961441f + 0328e426278555881c165818a11b54714229c289 - + https://github.com/dotnet/sdk - d1cabb18663f1d16fb613cb9265339ffb961441f + 0328e426278555881c165818a11b54714229c289 - + https://github.com/dotnet/sdk - d1cabb18663f1d16fb613cb9265339ffb961441f + 0328e426278555881c165818a11b54714229c289 - + https://github.com/dotnet/sdk - d1cabb18663f1d16fb613cb9265339ffb961441f + 0328e426278555881c165818a11b54714229c289 diff --git a/eng/Versions.props b/eng/Versions.props index 8e1dcf077..ce563a162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23127.2 - 8.0.100-preview.3.23127.2 - 8.0.100-preview.3.23127.2 + 8.0.100-preview.3.23127.4 + 8.0.100-preview.3.23127.4 + 8.0.100-preview.3.23127.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 94e129d6466558c391b068034f293e14b0a98e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 27 Feb 2023 16:02:25 +0100 Subject: [PATCH 364/864] Add VMR build for internal installer PRs (#15644) --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- .../templates/jobs/vmr-synchronization.yml | 19 +++---- eng/pipelines/vmr-build-internal.yml | 53 +++++++++++++++++++ eng/pipelines/vmr-build.yml | 1 + 4 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 eng/pipelines/vmr-build-internal.yml diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 8681d2faf..625e55eda 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -71,7 +71,7 @@ jobs: - template: /eng/common/templates/variables/pool-providers.yml - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: AzureDevOps-Artifact-Feeds-Pats - - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}: + - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/'))) }}: - group: DotNetBot-GitHub - ${{ else }}: - name: BotAccount-dotnet-bot-repo-PAT diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 0992b9d08..7849b23e0 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -25,15 +25,16 @@ jobs: - template: /eng/common/templates/variables/pool-providers.yml - name: vmrPath value: $(Agent.BuildDirectory)/vmr - - ${{ if and( eq(variables['System.TeamProject'], 'internal'), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - - group: DotNetBot-GitHub - - group: DotNetBot-GitHub-No-Scopes - - name: vmrPublicUrl - value: https://github.com/dotnet/dotnet - - ${{ if and( eq(variables['System.TeamProject'], 'internal'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}: - - group: DotNetBot-AzDO-PAT - - name: vmrInternalUrl - value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet + - ${{ if not(parameters.noPush) }}: + - ${{ if and( eq(variables['System.TeamProject'], 'internal'), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + - group: DotNetBot-GitHub + - group: DotNetBot-GitHub-No-Scopes + - name: vmrPublicUrl + value: https://github.com/dotnet/dotnet + - ${{ if and( eq(variables['System.TeamProject'], 'internal'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}: + - group: DotNetBot-AzDO-PAT + - name: vmrInternalUrl + value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/eng/pipelines/vmr-build-internal.yml b/eng/pipelines/vmr-build-internal.yml new file mode 100644 index 000000000..80e854d14 --- /dev/null +++ b/eng/pipelines/vmr-build-internal.yml @@ -0,0 +1,53 @@ +trigger: none +pr: + branches: + include: + - main + - release/* + - internal/release/* + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to use + type: string + default: ' ' + +- name: disableVmrBuild + displayName: Skip source-building the VMR + type: boolean + default: false + +variables: +- ${{ if ne(parameters.vmrBranch, ' ') }}: + - name: VmrBranch + value: ${{ replace(parameters.vmrBranch, ' ', '') }} +- ${{ else }}: + - name: VmrBranch + value: ${{ replace(replace(variables['System.PullRequest.TargetBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} + +resources: + repositories: + - repository: vmr + type: git + name: dotnet-dotnet + ref: $(VmrBranch) + +stages: +# You can temporarily disable the VMR Build stage by changing the default of disableVmrBuild +- ${{ if not(parameters.disableVmrBuild) }}: + - template: templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + isBuiltFromVmr: false + +# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate +# that the PR can be merged and later synchronized into the VMR without problems. +- ${{ else }}: + - stage: Synchronize_VMR + displayName: Synchronize VMR + dependsOn: [] + jobs: + - template: templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + noPush: true diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index a04202faf..a675aed38 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -50,3 +50,4 @@ stages: - template: templates/jobs/vmr-synchronization.yml parameters: vmrBranch: ${{ variables.VmrBranch }} + noPush: true From 58164d0ccbd35fb7017eb135884414281bece33d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 27 Feb 2023 09:52:35 -0600 Subject: [PATCH 365/864] Revert PVP flow for sourcelink (#15632) --- src/SourceBuild/content/repo-projects/sourcelink.proj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj index ac56e1d16..a048b6a1f 100644 --- a/src/SourceBuild/content/repo-projects/sourcelink.proj +++ b/src/SourceBuild/content/repo-projects/sourcelink.proj @@ -8,8 +8,6 @@ true - - DependenciesOnly From abea54e03fa7c47aababa21854b2dda35dd297ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 15:54:33 +0000 Subject: [PATCH 366/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230227.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23123.2 -> To Version 8.0.0-alpha.1.23127.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6aa3dba94..b16fadf01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 71ff04ed77c685b62f0b377ccdd4c17b8b6c15e6 + 9958e1ddf95c820caf386c5524c32b63bb1749be From 7d72c5a676b8fb4e1d03585bfec8a039c0693c74 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 27 Feb 2023 09:13:26 -0800 Subject: [PATCH 367/864] 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 4722e9934b72668c1652d4b42af7d37bc882d7b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 17:52:18 +0000 Subject: [PATCH 368/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23126.10 -> To Version 8.0.100-preview.3.23127.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23124.3 -> To Version 12.5.0-beta.23126.1 (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 4b9f2bc85..4b647f75d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0328e426278555881c165818a11b54714229c289 + ccd25c39368a4f9ed8c80a2b47251f4fb1326417 - + https://github.com/dotnet/sdk - 0328e426278555881c165818a11b54714229c289 + ccd25c39368a4f9ed8c80a2b47251f4fb1326417 - + https://github.com/dotnet/sdk - 0328e426278555881c165818a11b54714229c289 + ccd25c39368a4f9ed8c80a2b47251f4fb1326417 - + https://github.com/dotnet/sdk - 0328e426278555881c165818a11b54714229c289 + ccd25c39368a4f9ed8c80a2b47251f4fb1326417 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 71ca704b43ee711d5808e71be88c67e18e99eea0 - + https://github.com/dotnet/fsharp - 69e9a985b80c41e7d9d589e58b75a004831c07bc + 4de2393866be1be6fa35af544c6f25a10af5ab3d - + https://github.com/dotnet/fsharp - 69e9a985b80c41e7d9d589e58b75a004831c07bc + 4de2393866be1be6fa35af544c6f25a10af5ab3d @@ -151,9 +151,9 @@ 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/msbuild - d434c0e464ee0c119bdd5ee87b448e16fe0786be + 49c7a8cf6dc7425ae3205cbb4e5babe15b72c005 diff --git a/eng/Versions.props b/eng/Versions.props index ce563a162..723b1d29b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23127.4 - 8.0.100-preview.3.23127.4 - 8.0.100-preview.3.23127.4 + 8.0.100-preview.3.23127.5 + 8.0.100-preview.3.23127.5 + 8.0.100-preview.3.23127.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9392ef335293dedd8c24c98ba29c908a27e944b5 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 27 Feb 2023 18:53:02 +0000 Subject: [PATCH 369/864] Addressing review comments --- .../SdkContentTests.cs | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index eb2eeb740..a25129e24 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -28,15 +28,15 @@ public class SdkContentTests : SmokeTests { const string msftFileListingFileName = "msftSdkFiles.txt"; const string sbFileListingFileName = "sbSdkFiles.txt"; - WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true); - WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false); + WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true, "msft"); + WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false, "sb"); string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); diff = RemoveDiffMarkers(diff); BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } - private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable) + private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable, string sdkType) { if (!File.Exists(tarballPath)) { @@ -47,26 +47,23 @@ public class SdkContentTests : SmokeTests fileListing = BaselineHelper.RemoveRids(fileListing, isPortable); fileListing = BaselineHelper.RemoveVersions(fileListing); IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); - files = FilteredFileList( + files = RemoveExclusions( files, GetExclusionFilters( Path.Combine(BaselineHelper.GetAssetsDirectory(), "SdkDiffExclusions.txt"), - tarballPath == Config.MsftSdkTarballPath ? "msft" : "sb")); + sdkType)); File.WriteAllLines(outputFileName, files); } - private static IEnumerable FilteredFileList(IEnumerable files, IEnumerable exclusions) - { - return files - .Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item))); - } + private static IEnumerable RemoveExclusions(IEnumerable files, IEnumerable exclusions) => + files.Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item))); private static IEnumerable GetExclusionFilters(string exceptionFilePath, string sdkType) { - var text = File.ReadAllText(exceptionFilePath); + string[] lines = File.ReadAllLines(exceptionFilePath); int prefixSkip = sdkType.Length + 1; - return text.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries) + return lines .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions .Select(line => { From b86f2ee7f78c62de308ad64d63bfec3ce0512ff5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 19:33:47 +0000 Subject: [PATCH 370/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23126.8 -> To Version 7.0.300-preview.23127.9 --- 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 c6cde5faf..ad434a543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 - + https://github.com/dotnet/sdk - 3c28e76fd7d1463c7eeede4becafe7f6487b64aa + e349939f4a764d117269cba0f4205b0079403e61 diff --git a/eng/Versions.props b/eng/Versions.props index f1c223e1b..6b4a703e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23126.8 - 7.0.300-preview.23126.8 - 7.0.300-preview.23126.8 + 7.0.300-preview.23127.9 + 7.0.300-preview.23127.9 + 7.0.300-preview.23127.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0048bcd04618fd37255c405266a7c9b64cafce07 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 27 Feb 2023 19:51:40 +0000 Subject: [PATCH 371/864] Small update --- .../Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index a25129e24..ba7432dbe 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -61,9 +61,8 @@ public class SdkContentTests : SmokeTests private static IEnumerable GetExclusionFilters(string exceptionFilePath, string sdkType) { - string[] lines = File.ReadAllLines(exceptionFilePath); int prefixSkip = sdkType.Length + 1; - return lines + return File.ReadAllLines(exceptionFilePath) .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions .Select(line => { From 5c12d17216f411669c0beb40956249ec48bcb818 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 22:24:39 +0000 Subject: [PATCH 372/864] Merged PR 29822: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230227.12 - **Date Produced**: February 27, 2023 9:22:03 PM UTC - **Commit**: 8c1421b52282681e7b46f3e38ea0fc005897b076 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23121.9 to 7.0.104-servicing.23127.12][1] - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23121.9 to 7.0.104-servicing.23127.12][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23121.9 to 7.0.104-servicing.23127.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC50c5629&targetVersion=GC8c1421b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 074474e4c..a0c5b2dd3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,11 @@ + + @@ -19,10 +21,11 @@ - + + @@ -44,14 +47,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 129c2815d..2f059ff56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 + 8c1421b52282681e7b46f3e38ea0fc005897b076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 + 8c1421b52282681e7b46f3e38ea0fc005897b076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 + 8c1421b52282681e7b46f3e38ea0fc005897b076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 50c5629d65a1a82a37f9384017cdfcc4f8ab5e16 + 8c1421b52282681e7b46f3e38ea0fc005897b076 diff --git a/eng/Versions.props b/eng/Versions.props index 865d0be93..2212d881c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.104 - 7.0.104-servicing.23121.9 - 7.0.104-servicing.23121.9 + 7.0.104-servicing.23127.12 + 7.0.104-servicing.23127.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a516d2a80c9505e758c77481b83f8ca29e09717 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 22:25:05 +0000 Subject: [PATCH 373/864] Merged PR 29817: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-6.23109.5 to 4.5.0-6.23123.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230227.10 - **Date Produced**: February 27, 2023 7:35:58 PM UTC - **Commit**: 19d897be95902ca23a704f58d2fa7adf5b13106c - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.201 to 7.0.202][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.NET.Sdk**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23109.5 to 4.5.0-6.23123.11][4] - **Microsoft.Build**: [from 17.5.0 to 17.5.0][5] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ce1f1e&targetVersion=GC19d897b&_a=files [4]: https://github.com/dotnet/roslyn/compare/6a5a63b...271ccd7 [5]: https://github.com/dotnet/msbuild/compare/81ac935...8ce3029 [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 11 ++++++++--- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19bd67321..e1a92ae53 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,24 @@ + + - + - + + @@ -44,14 +47,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adc73944..9f53963bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 + 271ccd71554f7d28d2f90551aafd0bdeb5d327aa https://github.com/dotnet/msbuild - 81ac93548ee1044f03d0ac363712bb778920ef8c + 8ce3029f48a4169237024a8f0bb4b07727a151a7 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 975e77088..cce7a122a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.201 - 7.0.201-rtm.23120.7 - 7.0.201-rtm.23120.7 + 7.0.202 + 7.0.202-servicing.23127.10 + 7.0.202-servicing.23127.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a36d29efccfeddd6e0c9d9ed02e4305381d2569 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 22:39:55 +0000 Subject: [PATCH 374/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230227.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23123.2 -> To Version 8.0.0-alpha.1.23127.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b16fadf01..472ca2cc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 9958e1ddf95c820caf386c5524c32b63bb1749be + 72584554974ece2019fbd3dd6743a282f39d9b87 From d45e89a95f2e84154d9c59a0fbaf91f13f8ff197 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 27 Feb 2023 22:44:16 +0000 Subject: [PATCH 375/864] Update exclusions list and baseline --- .../assets/SdkDiffExclusions.txt | 12 + .../assets/baselines/MsftToSbSdk.diff | 611 +----------------- 2 files changed, 13 insertions(+), 610 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt index a7a0e38f8..ba9b13cab 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt @@ -12,6 +12,18 @@ # We do not want to filter-out folder entries, therefore, we should use: '?*' and not just '*' msft,./sdk/x.y.z/TestHostNetFramework/?* # Intentional - MSFT build includes test-host that targets netcoreapp3.1 +msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/?* # Intentional - source-build includes SDK Publishing package that target latest .NET TFM msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/?* # Intentional - explicitly excluded from source-build sb,./sdk/x.y.z/TestHost/?* # Intentional - source-build includes test-host that targets latest .NET TFM +# vstest localization is disabled in Linux builds - https://github.com/microsoft/vstest/issues/4305 +msft,./sdk/x.y.z/*?/Microsoft.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/*?/Test.Utility.resources.dll +msft,./sdk/x.y.z/*?/vstest.console.resources.dll +msft,./sdk/x.y.z/Extensions/*?/Microsoft.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/Extensions/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll + +# nuget localization is not available for Linux builds - https://github.com/NuGet/Home/issues/12440 +msft,./sdk/x.y.z/*?/NuGet.*?.resources.dll +msft,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*?/NuGet.*?.resources.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 1ee13e55e..93b883c6f 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -81,45 +81,6 @@ index ------------ ./sdk/x.y.z/cs/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/cs/MSBuild.resources.dll --./sdk/x.y.z/cs/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/cs/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/cs/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/cs/NuGet.Commands.resources.dll --./sdk/x.y.z/cs/NuGet.Common.resources.dll --./sdk/x.y.z/cs/NuGet.Configuration.resources.dll --./sdk/x.y.z/cs/NuGet.Credentials.resources.dll --./sdk/x.y.z/cs/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Frameworks.resources.dll --./sdk/x.y.z/cs/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/cs/NuGet.Localization.resources.dll --./sdk/x.y.z/cs/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.resources.dll --./sdk/x.y.z/cs/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/cs/NuGet.Protocol.resources.dll --./sdk/x.y.z/cs/NuGet.Resolver.resources.dll --./sdk/x.y.z/cs/NuGet.Versioning.resources.dll --./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/cs/System.CommandLine.resources.dll --./sdk/x.y.z/cs/Test.Utility.resources.dll --./sdk/x.y.z/cs/vstest.console.resources.dll - ./sdk/x.y.z/Current/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ @@ ------------ @@ ./sdk/x.y.z/datacollector.runtimeconfig.json ./sdk/x.y.z/de/ @@ -132,45 +93,6 @@ index ------------ ./sdk/x.y.z/de/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/de/MSBuild.resources.dll --./sdk/x.y.z/de/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/de/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/de/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/de/NuGet.Commands.resources.dll --./sdk/x.y.z/de/NuGet.Common.resources.dll --./sdk/x.y.z/de/NuGet.Configuration.resources.dll --./sdk/x.y.z/de/NuGet.Credentials.resources.dll --./sdk/x.y.z/de/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/de/NuGet.Frameworks.resources.dll --./sdk/x.y.z/de/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/de/NuGet.Localization.resources.dll --./sdk/x.y.z/de/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.resources.dll --./sdk/x.y.z/de/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/de/NuGet.Protocol.resources.dll --./sdk/x.y.z/de/NuGet.Resolver.resources.dll --./sdk/x.y.z/de/NuGet.Versioning.resources.dll --./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/de/System.CommandLine.resources.dll --./sdk/x.y.z/de/Test.Utility.resources.dll --./sdk/x.y.z/de/vstest.console.resources.dll - ./sdk/x.y.z/dotnet.deps.json - ./sdk/x.y.z/dotnet.dll - ./sdk/x.y.z/dotnet.runtimeconfig.json @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -284,54 +206,11 @@ index ------------ ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/es/MSBuild.resources.dll --./sdk/x.y.z/es/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/es/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/es/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/es/NuGet.Commands.resources.dll --./sdk/x.y.z/es/NuGet.Common.resources.dll --./sdk/x.y.z/es/NuGet.Configuration.resources.dll --./sdk/x.y.z/es/NuGet.Credentials.resources.dll --./sdk/x.y.z/es/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/es/NuGet.Frameworks.resources.dll --./sdk/x.y.z/es/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/es/NuGet.Localization.resources.dll --./sdk/x.y.z/es/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.resources.dll --./sdk/x.y.z/es/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/es/NuGet.Protocol.resources.dll --./sdk/x.y.z/es/NuGet.Resolver.resources.dll --./sdk/x.y.z/es/NuGet.Versioning.resources.dll --./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/es/System.CommandLine.resources.dll --./sdk/x.y.z/es/Test.Utility.resources.dll --./sdk/x.y.z/es/vstest.console.resources.dll ./sdk/x.y.z/Extensions/ -./sdk/x.y.z/Extensions/cs/ --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/de/ --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/dump/ -./sdk/x.y.z/Extensions/dump/DumpMinitool.arm64.exe -./sdk/x.y.z/Extensions/dump/DumpMinitool.arm64.exe.config @@ -340,35 +219,10 @@ index ------------ -./sdk/x.y.z/Extensions/dump/DumpMinitool.x86.exe -./sdk/x.y.z/Extensions/dump/DumpMinitool.x86.exe.config -./sdk/x.y.z/Extensions/es/ --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/fr/ --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/it/ --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ja/ --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ko/ --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll @@ -376,41 +230,11 @@ index ------------ ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll -./sdk/x.y.z/Extensions/pl/ --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/pt-BR/ --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ru/ --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/tr/ --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/zh-Hans/ --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/zh-Hant/ --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll ./sdk/x.y.z/fr/ ./sdk/x.y.z/fr/dotnet.resources.dll -./sdk/x.y.z/fr/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -421,45 +245,6 @@ index ------------ ./sdk/x.y.z/fr/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/fr/MSBuild.resources.dll --./sdk/x.y.z/fr/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/fr/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/fr/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/fr/NuGet.Commands.resources.dll --./sdk/x.y.z/fr/NuGet.Common.resources.dll --./sdk/x.y.z/fr/NuGet.Configuration.resources.dll --./sdk/x.y.z/fr/NuGet.Credentials.resources.dll --./sdk/x.y.z/fr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/fr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/fr/NuGet.Localization.resources.dll --./sdk/x.y.z/fr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.resources.dll --./sdk/x.y.z/fr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/fr/NuGet.Protocol.resources.dll --./sdk/x.y.z/fr/NuGet.Resolver.resources.dll --./sdk/x.y.z/fr/NuGet.Versioning.resources.dll --./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/fr/System.CommandLine.resources.dll --./sdk/x.y.z/fr/Test.Utility.resources.dll --./sdk/x.y.z/fr/vstest.console.resources.dll - ./sdk/x.y.z/FSharp/ - ./sdk/x.y.z/FSharp/cs/ - ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll @@ -497,41 +282,7 @@ index ------------ ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/it/MSBuild.resources.dll --./sdk/x.y.z/it/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/it/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/it/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/it/NuGet.Commands.resources.dll --./sdk/x.y.z/it/NuGet.Common.resources.dll --./sdk/x.y.z/it/NuGet.Configuration.resources.dll --./sdk/x.y.z/it/NuGet.Credentials.resources.dll --./sdk/x.y.z/it/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/it/NuGet.Frameworks.resources.dll --./sdk/x.y.z/it/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/it/NuGet.Localization.resources.dll --./sdk/x.y.z/it/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.resources.dll --./sdk/x.y.z/it/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/it/NuGet.Protocol.resources.dll --./sdk/x.y.z/it/NuGet.Resolver.resources.dll --./sdk/x.y.z/it/NuGet.Versioning.resources.dll --./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/it/System.CommandLine.resources.dll --./sdk/x.y.z/it/Test.Utility.resources.dll --./sdk/x.y.z/it/vstest.console.resources.dll ./sdk/x.y.z/ja/ ./sdk/x.y.z/ja/dotnet.resources.dll -./sdk/x.y.z/ja/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -543,41 +294,7 @@ index ------------ ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/ja/MSBuild.resources.dll --./sdk/x.y.z/ja/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ja/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ja/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ja/NuGet.Commands.resources.dll --./sdk/x.y.z/ja/NuGet.Common.resources.dll --./sdk/x.y.z/ja/NuGet.Configuration.resources.dll --./sdk/x.y.z/ja/NuGet.Credentials.resources.dll --./sdk/x.y.z/ja/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ja/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ja/NuGet.Localization.resources.dll --./sdk/x.y.z/ja/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.resources.dll --./sdk/x.y.z/ja/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ja/NuGet.Protocol.resources.dll --./sdk/x.y.z/ja/NuGet.Resolver.resources.dll --./sdk/x.y.z/ja/NuGet.Versioning.resources.dll --./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ja/System.CommandLine.resources.dll --./sdk/x.y.z/ja/Test.Utility.resources.dll --./sdk/x.y.z/ja/vstest.console.resources.dll ./sdk/x.y.z/ko/ ./sdk/x.y.z/ko/dotnet.resources.dll -./sdk/x.y.z/ko/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -589,41 +306,7 @@ index ------------ ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/ko/MSBuild.resources.dll --./sdk/x.y.z/ko/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ko/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ko/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ko/NuGet.Commands.resources.dll --./sdk/x.y.z/ko/NuGet.Common.resources.dll --./sdk/x.y.z/ko/NuGet.Configuration.resources.dll --./sdk/x.y.z/ko/NuGet.Credentials.resources.dll --./sdk/x.y.z/ko/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ko/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ko/NuGet.Localization.resources.dll --./sdk/x.y.z/ko/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.resources.dll --./sdk/x.y.z/ko/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ko/NuGet.Protocol.resources.dll --./sdk/x.y.z/ko/NuGet.Resolver.resources.dll --./sdk/x.y.z/ko/NuGet.Versioning.resources.dll --./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ko/System.CommandLine.resources.dll --./sdk/x.y.z/ko/Test.Utility.resources.dll --./sdk/x.y.z/ko/vstest.console.resources.dll ./sdk/x.y.z/Microsoft.ApplicationInsights.dll ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll +./sdk/x.y.z/Microsoft.Bcl.AsyncInterfaces.dll @@ -667,41 +350,7 @@ index ------------ ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/pl/MSBuild.resources.dll --./sdk/x.y.z/pl/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/pl/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/pl/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/pl/NuGet.Commands.resources.dll --./sdk/x.y.z/pl/NuGet.Common.resources.dll --./sdk/x.y.z/pl/NuGet.Configuration.resources.dll --./sdk/x.y.z/pl/NuGet.Credentials.resources.dll --./sdk/x.y.z/pl/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pl/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pl/NuGet.Localization.resources.dll --./sdk/x.y.z/pl/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.resources.dll --./sdk/x.y.z/pl/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pl/NuGet.Protocol.resources.dll --./sdk/x.y.z/pl/NuGet.Resolver.resources.dll --./sdk/x.y.z/pl/NuGet.Versioning.resources.dll --./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/pl/System.CommandLine.resources.dll --./sdk/x.y.z/pl/Test.Utility.resources.dll --./sdk/x.y.z/pl/vstest.console.resources.dll ./sdk/x.y.z/pt-BR/ ./sdk/x.y.z/pt-BR/dotnet.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -712,45 +361,6 @@ index ------------ ./sdk/x.y.z/pt-BR/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/pt-BR/MSBuild.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Commands.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Common.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Configuration.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Credentials.resources.dll --./sdk/x.y.z/pt-BR/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Localization.resources.dll --./sdk/x.y.z/pt-BR/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.resources.dll --./sdk/x.y.z/pt-BR/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Protocol.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Resolver.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll --./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll --./sdk/x.y.z/pt-BR/Test.Utility.resources.dll --./sdk/x.y.z/pt-BR/vstest.console.resources.dll - ./sdk/x.y.z/ref/ - ./sdk/x.y.z/ref/Microsoft.Build.Framework.dll - ./sdk/x.y.z/ref/Microsoft.Build.Utilities.Core.dll @@ ------------ @@ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll @@ -773,45 +383,6 @@ index ------------ ./sdk/x.y.z/ru/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/ru/MSBuild.resources.dll --./sdk/x.y.z/ru/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ru/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ru/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ru/NuGet.Commands.resources.dll --./sdk/x.y.z/ru/NuGet.Common.resources.dll --./sdk/x.y.z/ru/NuGet.Configuration.resources.dll --./sdk/x.y.z/ru/NuGet.Credentials.resources.dll --./sdk/x.y.z/ru/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ru/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ru/NuGet.Localization.resources.dll --./sdk/x.y.z/ru/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.resources.dll --./sdk/x.y.z/ru/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ru/NuGet.Protocol.resources.dll --./sdk/x.y.z/ru/NuGet.Resolver.resources.dll --./sdk/x.y.z/ru/NuGet.Versioning.resources.dll --./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ru/System.CommandLine.resources.dll --./sdk/x.y.z/ru/Test.Utility.resources.dll --./sdk/x.y.z/ru/vstest.console.resources.dll - ./sdk/x.y.z/RuntimeIdentifierGraph.json - ./sdk/x.y.z/runtimes/ - ./sdk/x.y.z/runtimes/any/ @@ ------------ @@ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll @@ -833,48 +404,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/ -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Bcl.AsyncInterfaces.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.NET.Sdk.Publish.Tasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.NET.Sdk.Publish.Tasks.dll.config --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Delegation.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Deployment.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Deployment.Tracing.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.XmlTransform.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Buffers.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Text.Encodings.Web.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Text.Json.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Threading.Tasks.Extensions.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.ValueTuple.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ -911,32 +440,19 @@ index ------------ ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/NuGet.Build.Tasks.Pack.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll @@ -950,32 +466,19 @@ index ------------ +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/NuGet.Build.Tasks.Pack.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll -./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll @@ -1044,45 +547,6 @@ index ------------ ./sdk/x.y.z/tr/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/tr/MSBuild.resources.dll --./sdk/x.y.z/tr/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/tr/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/tr/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/tr/NuGet.Commands.resources.dll --./sdk/x.y.z/tr/NuGet.Common.resources.dll --./sdk/x.y.z/tr/NuGet.Configuration.resources.dll --./sdk/x.y.z/tr/NuGet.Credentials.resources.dll --./sdk/x.y.z/tr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/tr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/tr/NuGet.Localization.resources.dll --./sdk/x.y.z/tr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.resources.dll --./sdk/x.y.z/tr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/tr/NuGet.Protocol.resources.dll --./sdk/x.y.z/tr/NuGet.Resolver.resources.dll --./sdk/x.y.z/tr/NuGet.Versioning.resources.dll --./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/tr/System.CommandLine.resources.dll --./sdk/x.y.z/tr/Test.Utility.resources.dll --./sdk/x.y.z/tr/vstest.console.resources.dll - ./sdk/x.y.z/trustedroots/ - ./sdk/x.y.z/trustedroots/codesignctl.pem - ./sdk/x.y.z/trustedroots/timestampctl.pem @@ ------------ @@ ./sdk/x.y.z/vstest.console.runtimeconfig.json ./sdk/x.y.z/zh-Hans/ @@ -1096,41 +560,7 @@ index ------------ ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/zh-Hans/MSBuild.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Commands.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Common.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Configuration.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hans/Test.Utility.resources.dll --./sdk/x.y.z/zh-Hans/vstest.console.resources.dll ./sdk/x.y.z/zh-Hant/ ./sdk/x.y.z/zh-Hant/dotnet.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -1140,43 +570,4 @@ index ------------ -./sdk/x.y.z/zh-Hant/Microsoft.CodeCoverage.IO.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.Deployment.DotNet.Releases.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Utils.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Commands.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Common.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Configuration.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hant/Test.Utility.resources.dll --./sdk/x.y.z/zh-Hant/vstest.console.resources.dll - ./shared/ - ./shared/Microsoft.AspNetCore.App/ - ./shared/Microsoft.AspNetCore.App/x.y.z/ \ No newline at end of file + ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll \ No newline at end of file From 2e73c9d439e3d48efbd557619d1de0475176b881 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 27 Feb 2023 17:27:08 -0600 Subject: [PATCH 376/864] Patch to enable packable razor projects (#15654) --- ...1-Enable packable projects for razor.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch diff --git a/src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch b/src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch new file mode 100644 index 000000000..1d73a65dd --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch @@ -0,0 +1,50 @@ +From 30e113f3ed92e152b7ffb9d633e505bc67331290 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Mon, 27 Feb 2023 14:02:25 -0600 +Subject: [PATCH] Enable packable projects for razor + +Backport: https://github.com/dotnet/razor/issues/8332 +--- + .../Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj | 2 +- + ...soft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj | 2 +- + .../Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj +index 547da8632..606af7bf4 100644 +--- a/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj ++++ b/src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport/Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj +@@ -7,7 +7,7 @@ + false + true + false +- true ++ true + + false + +diff --git a/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj +index 00e1cedec..cc1f32523 100644 +--- a/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj ++++ b/src/Compiler/tools/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal/Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj +@@ -5,7 +5,7 @@ + netstandard2.0 + false + false +- true ++ true + false + + +diff --git a/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj +index 7216edbe7..c1fbd3af4 100644 +--- a/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj ++++ b/src/Compiler/tools/Microsoft.CodeAnalysis.Razor.Tooling.Internal/Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj +@@ -5,7 +5,7 @@ + netstandard2.0 + false + false +- true ++ true + false + From 21c6fa3b929e91bbf1a2b39e51efff1d84f6fcdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 03:04:07 +0000 Subject: [PATCH 377/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23126.10 -> To Version 8.0.100-preview.3.23127.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 8.0.0-preview.3.23126.2 -> To Version 8.0.0-preview.3.23127.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b647f75d..679edb627 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada - + https://github.com/dotnet/aspnetcore - 446e27e0fd79ab0e0193915d8d342b6f787a7569 + 531a93a372c3da0c68ce29da78890fb384c62ada https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ccd25c39368a4f9ed8c80a2b47251f4fb1326417 + 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd - + https://github.com/dotnet/sdk - ccd25c39368a4f9ed8c80a2b47251f4fb1326417 + 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd - + https://github.com/dotnet/sdk - ccd25c39368a4f9ed8c80a2b47251f4fb1326417 + 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd - + https://github.com/dotnet/sdk - ccd25c39368a4f9ed8c80a2b47251f4fb1326417 + 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd diff --git a/eng/Versions.props b/eng/Versions.props index 723b1d29b..4b9d4d717 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23126.2 - 8.0.0-preview.3.23126.2 - 8.0.0-preview.3.23126.2 - 8.0.0-preview.3.23126.2 - 8.0.0-preview.3.23126.2 - 8.0.0-preview.3.23126.2 - 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.11 0.2.0 - 8.0.100-preview.3.23127.5 - 8.0.100-preview.3.23127.5 - 8.0.100-preview.3.23127.5 + 8.0.100-preview.3.23127.15 + 8.0.100-preview.3.23127.15 + 8.0.100-preview.3.23127.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 474c3e274874fb7686ef470ecfd1214df1c2d721 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 03:22:46 +0000 Subject: [PATCH 378/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23126.8 -> To Version 7.0.300-preview.23127.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23126.1 -> To Version 12.5.0-beta.23127.2 (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 ad434a543..bc3fd235b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 - + https://github.com/dotnet/sdk - e349939f4a764d117269cba0f4205b0079403e61 + bb91913be6e9b077dbaba0fee491071540df7f20 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 4de2393866be1be6fa35af544c6f25a10af5ab3d + 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce - + https://github.com/dotnet/fsharp - 4de2393866be1be6fa35af544c6f25a10af5ab3d + 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce diff --git a/eng/Versions.props b/eng/Versions.props index 6b4a703e7..8e41cb3cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23127.9 - 7.0.300-preview.23127.9 - 7.0.300-preview.23127.9 + 7.0.300-preview.23127.14 + 7.0.300-preview.23127.14 + 7.0.300-preview.23127.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20b7d17c1cc3afe41fec776617d0335965d23089 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 06:36:38 +0000 Subject: [PATCH 379/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23127.15 -> To Version 8.0.100-preview.3.23127.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23125.1 -> To Version 8.0.0-preview.3.23127.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e63162f8f..8e03a35bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - b587906c2964aaefab5fbd7a27af5fbc59120a4e + 843ad97202a7886a90557f5aa5541501b5879d61 - + https://github.com/dotnet/windowsdesktop - b587906c2964aaefab5fbd7a27af5fbc59120a4e + 843ad97202a7886a90557f5aa5541501b5879d61 - + https://github.com/dotnet/windowsdesktop - b587906c2964aaefab5fbd7a27af5fbc59120a4e + 843ad97202a7886a90557f5aa5541501b5879d61 - + https://github.com/dotnet/windowsdesktop - b587906c2964aaefab5fbd7a27af5fbc59120a4e + 843ad97202a7886a90557f5aa5541501b5879d61 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 https://github.com/dotnet/aspnetcore @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd + fef92ae83785b1e94bbc57d508da7e2367a0b334 - + https://github.com/dotnet/sdk - 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd + fef92ae83785b1e94bbc57d508da7e2367a0b334 - + https://github.com/dotnet/sdk - 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd + fef92ae83785b1e94bbc57d508da7e2367a0b334 - + https://github.com/dotnet/sdk - 6b3c6786828ce5aaf14e609e6db0ced8c8db8abd + fef92ae83785b1e94bbc57d508da7e2367a0b334 - + https://github.com/dotnet/winforms - 9749eb0e0d1b7c992332061133974e0ca6ba6453 + 957520b0533d3085136b5599a83618cd697a088d - + https://github.com/dotnet/wpf - 71ca704b43ee711d5808e71be88c67e18e99eea0 + d8e54e5c5e5491f17bf66eb3c8bdc6505aee61ef https://github.com/dotnet/fsharp @@ -142,13 +142,13 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - eb20195fb00d3cc7217a10b7de4b3b00710ce672 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/roslyn - 4641f2bff815fb7743be8aa2bdafe82b74a1f756 + 6960e05657c37fbfc31b55bfa3a3fc8a00b61703 diff --git a/eng/Versions.props b/eng/Versions.props index 4b9d4d717..250c5dbfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23124.8 + 8.0.0-preview.3.23126.1 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23126.1 @@ -71,33 +71,33 @@ - 8.0.100-preview.3.23127.15 - 8.0.100-preview.3.23127.15 - 8.0.100-preview.3.23127.15 + 8.0.100-preview.3.23127.17 + 8.0.100-preview.3.23127.17 + 8.0.100-preview.3.23127.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23127.4 - 8.0.0-preview.2.23126.3 - 8.0.0-preview.2.23126.3 - 8.0.0-preview.2.23126.3 - 8.0.0-preview.2.23126.3 - 8.0.0-preview.2.23126.3 - 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23127.4 + 8.0.0-preview.2.23127.4 + 8.0.0-preview.2.23127.4 + 8.0.0-preview.2.23127.4 + 8.0.0-preview.2.23127.4 + 8.0.0-preview.2.23127.4 2.1.0 - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.3.23127.4 + 8.0.0-preview.3.23127.4 + 8.0.0-preview.3.23127.4 + 8.0.0-preview.3.23127.4 From ced627895feda3a04bbf46ddd02a22ee2cd3f3bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 07:29:20 +0000 Subject: [PATCH 380/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23127.15 -> To Version 8.0.100-preview.3.23127.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23125.1 -> To Version 8.0.0-preview.3.23127.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e03a35bb..2d0061450 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 - + https://github.com/dotnet/aspnetcore - 531a93a372c3da0c68ce29da78890fb384c62ada + 3265dc6a9b05c74b199aa39351e5413317df9ad5 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fef92ae83785b1e94bbc57d508da7e2367a0b334 + 5b2908289e7baf097dee2c727279071af165f235 - + https://github.com/dotnet/sdk - fef92ae83785b1e94bbc57d508da7e2367a0b334 + 5b2908289e7baf097dee2c727279071af165f235 - + https://github.com/dotnet/sdk - fef92ae83785b1e94bbc57d508da7e2367a0b334 + 5b2908289e7baf097dee2c727279071af165f235 - + https://github.com/dotnet/sdk - fef92ae83785b1e94bbc57d508da7e2367a0b334 + 5b2908289e7baf097dee2c727279071af165f235 diff --git a/eng/Versions.props b/eng/Versions.props index 250c5dbfc..dce57d74a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23127.11 - 8.0.0-preview.3.23127.11 - 8.0.0-preview.3.23127.11 - 8.0.0-preview.3.23127.11 - 8.0.0-preview.3.23127.11 - 8.0.0-preview.3.23127.11 - 8.0.0-preview.3.23127.11 + 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23127.13 0.2.0 - 8.0.100-preview.3.23127.17 - 8.0.100-preview.3.23127.17 - 8.0.100-preview.3.23127.17 + 8.0.100-preview.3.23127.18 + 8.0.100-preview.3.23127.18 + 8.0.100-preview.3.23127.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6cb0a28d00b1d31bdbb8e75c1f6b1a1df9256fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 08:40:32 +0000 Subject: [PATCH 381/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23127.15 -> To Version 8.0.100-preview.3.23127.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.2.23125.1 -> To Version 8.0.0-preview.3.23127.4 (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 2d0061450..8cf30d593 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 5b2908289e7baf097dee2c727279071af165f235 + fbc089ea96f0187c31e9ae176278334c8d5defc6 - + https://github.com/dotnet/sdk - 5b2908289e7baf097dee2c727279071af165f235 + fbc089ea96f0187c31e9ae176278334c8d5defc6 - + https://github.com/dotnet/sdk - 5b2908289e7baf097dee2c727279071af165f235 + fbc089ea96f0187c31e9ae176278334c8d5defc6 - + https://github.com/dotnet/sdk - 5b2908289e7baf097dee2c727279071af165f235 + fbc089ea96f0187c31e9ae176278334c8d5defc6 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/roslyn - 6960e05657c37fbfc31b55bfa3a3fc8a00b61703 + 22bdff50d72eec9120bb1b68ce49668fda91d0a2 diff --git a/eng/Versions.props b/eng/Versions.props index dce57d74a..1ad3e99bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23127.18 - 8.0.100-preview.3.23127.18 - 8.0.100-preview.3.23127.18 + 8.0.100-preview.3.23127.20 + 8.0.100-preview.3.23127.20 + 8.0.100-preview.3.23127.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 30795b7041a987cbe0380813316cdbae0b2bb82e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 09:05:36 +0000 Subject: [PATCH 382/864] Update dependencies from https://github.com/dotnet/sdk build 20230227.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23127.14 -> To Version 7.0.300-preview.23127.19 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23126.2 -> To Version 4.6.0-2.23127.9 (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 bc3fd235b..00d896e3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 - + https://github.com/dotnet/sdk - bb91913be6e9b077dbaba0fee491071540df7f20 + 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 4641f2bff815fb7743be8aa2bdafe82b74a1f756 + 22bdff50d72eec9120bb1b68ce49668fda91d0a2 diff --git a/eng/Versions.props b/eng/Versions.props index 8e41cb3cb..4d1b0b0de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23127.14 - 7.0.300-preview.23127.14 - 7.0.300-preview.23127.14 + 7.0.300-preview.23127.19 + 7.0.300-preview.23127.19 + 7.0.300-preview.23127.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c74320bc3ea80d03493a069e4c424b19a5a1983 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Feb 2023 15:54:28 +0000 Subject: [PATCH 383/864] Merged PR 29823: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-6.23123.11 to 4.5.0-6.23127.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230228.1 - **Date Produced**: February 28, 2023 10:36:52 AM UTC - **Commit**: 288f1065b0d882689bdbee4a91ceb34617fc9f96 - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.202][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6] - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6] - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23123.11 to 4.5.0-6.23127.3][7] - **Microsoft.Build**: [from 17.5.0 to 17.5.0][8] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19d897b&targetVersion=GC288f106&_a=files [7]: https://github.com/dotnet/roslyn/compare/271ccd7...e2bc27d [8]: https://github.com/dotnet/msbuild/compare/8ce3029...6f08c67 [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1a92ae53..7723bf088 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,13 +15,13 @@ - + - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f53963bf..0c5879ac0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19d897be95902ca23a704f58d2fa7adf5b13106c + 288f1065b0d882689bdbee4a91ceb34617fc9f96 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 271ccd71554f7d28d2f90551aafd0bdeb5d327aa + e2bc27d266040403e0c6de24f29a6bdce5cc7231 https://github.com/dotnet/msbuild - 8ce3029f48a4169237024a8f0bb4b07727a151a7 + 6f08c67f3ed838dccfbcdab91e6bebc54a26fd94 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index cce7a122a..3219402b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.202 - 7.0.202-servicing.23127.10 - 7.0.202-servicing.23127.10 + 7.0.202-servicing.23128.1 + 7.0.202-servicing.23128.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2cf3ff85a0045feef2ea2ab2477b84a481f59735 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 28 Feb 2023 10:46:20 -0600 Subject: [PATCH 384/864] Remove spaces from patch razor patch filename (#15662) --- ...zor.patch => 0001-Enable-packable-projects-for-razor.patch} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename src/SourceBuild/patches/razor/{0001-Enable packable projects for razor.patch => 0001-Enable-packable-projects-for-razor.patch} (98%) diff --git a/src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch b/src/SourceBuild/patches/razor/0001-Enable-packable-projects-for-razor.patch similarity index 98% rename from src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch rename to src/SourceBuild/patches/razor/0001-Enable-packable-projects-for-razor.patch index 1d73a65dd..c732c96ba 100644 --- a/src/SourceBuild/patches/razor/0001-Enable packable projects for razor.patch +++ b/src/SourceBuild/patches/razor/0001-Enable-packable-projects-for-razor.patch @@ -1,4 +1,4 @@ -From 30e113f3ed92e152b7ffb9d633e505bc67331290 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 27 Feb 2023 14:02:25 -0600 Subject: [PATCH] Enable packable projects for razor @@ -48,3 +48,4 @@ index 7216edbe7..c1fbd3af4 100644 + true false + From f1cd2c183b0692ada45c1cf338b4b7b15cc1a798 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 28 Feb 2023 18:06:46 +0000 Subject: [PATCH 385/864] More exclusions and updated baseline --- .../assets/SdkDiffExclusions.txt | 15 +- .../assets/baselines/MsftToSbSdk.diff | 259 ++---------------- 2 files changed, 34 insertions(+), 240 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt index ba9b13cab..f8707c50b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt @@ -17,6 +17,7 @@ msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/?* # Intentional - expl sb,./sdk/x.y.z/TestHost/?* # Intentional - source-build includes test-host that targets latest .NET TFM # vstest localization is disabled in Linux builds - https://github.com/microsoft/vstest/issues/4305 +msft,./sdk/x.y.z/*?/Microsoft.CodeCoverage.IO.resources.dll msft,./sdk/x.y.z/*?/Microsoft.TestPlatform.*?.resources.dll msft,./sdk/x.y.z/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll msft,./sdk/x.y.z/*?/Test.Utility.resources.dll @@ -26,4 +27,16 @@ msft,./sdk/x.y.z/Extensions/*?/Microsoft.VisualStudio.TestPlatform.*?.resources. # nuget localization is not available for Linux builds - https://github.com/NuGet/Home/issues/12440 msft,./sdk/x.y.z/*?/NuGet.*?.resources.dll -msft,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*?/NuGet.*?.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.Build.NuGetSdkResolver.resources.dll + +# ILMerge is not supported in Linux builds - excluding the whole NuGet.Build.Tasks.Pack directory, to avoid a noisy diff +msft,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? +sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? + +# missing workload manifests - https://github.com/dotnet/source-build/issues/3242 +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maui/* +msft,./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 93b883c6f..efc564a92 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -45,54 +45,13 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/microsoft.net.sdk.android/ --./sdk-manifests/x.y.z/microsoft.net.sdk.android/WorkloadManifest.json --./sdk-manifests/x.y.z/microsoft.net.sdk.android/WorkloadManifest.targets --./sdk-manifests/x.y.z/microsoft.net.sdk.ios/ --./sdk-manifests/x.y.z/microsoft.net.sdk.ios/WorkloadManifest.json --./sdk-manifests/x.y.z/microsoft.net.sdk.ios/WorkloadManifest.targets --./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/ --./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/WorkloadManifest.json --./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/WorkloadManifest.targets --./sdk-manifests/x.y.z/microsoft.net.sdk.macos/ --./sdk-manifests/x.y.z/microsoft.net.sdk.macos/WorkloadManifest.json --./sdk-manifests/x.y.z/microsoft.net.sdk.macos/WorkloadManifest.targets --./sdk-manifests/x.y.z/microsoft.net.sdk.maui/ --./sdk-manifests/x.y.z/microsoft.net.sdk.maui/WorkloadManifest.json --./sdk-manifests/x.y.z/microsoft.net.sdk.maui/WorkloadManifest.targets --./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/ --./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/WorkloadManifest.json --./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/WorkloadManifest.targets - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/WorkloadManifest.json - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/WorkloadManifest.targets -@@ ------------ @@ - ./sdk/x.y.z/AppHostTemplate/apphost - ./sdk/x.y.z/cs/ - ./sdk/x.y.z/cs/dotnet.resources.dll --./sdk/x.y.z/cs/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/cs/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/cs/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/datacollector.runtimeconfig.json - ./sdk/x.y.z/de/ - ./sdk/x.y.z/de/dotnet.resources.dll --./sdk/x.y.z/de/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/de/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/de/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Utils.resources.dll + ./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.current/localize/WorkloadManifest.zh-Hant.json + ./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.current/WorkloadManifest.json + ./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.current/WorkloadManifest.targets ++./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.current/WorkloadManifest.Wasi.targets + ./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.net6/ + ./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.net6/localize/ + ./sdk-manifests/x.y.z/microsoft.net.workload.mono.toolchain.net6/localize/WorkloadManifest.cs.json @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -193,18 +152,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/zh-Hant/System.CommandLine.resources.dll - ./sdk/x.y.z/es/ - ./sdk/x.y.z/es/dotnet.resources.dll --./sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/es/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/es/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/es/MSBuild.resources.dll ./sdk/x.y.z/es/System.CommandLine.resources.dll @@ -237,14 +184,7 @@ index ------------ -./sdk/x.y.z/Extensions/zh-Hant/ ./sdk/x.y.z/fr/ ./sdk/x.y.z/fr/dotnet.resources.dll --./sdk/x.y.z/fr/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/fr/Microsoft.Build.resources.dll - ./sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/fr/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/fr/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/fr/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll @@ -269,42 +209,6 @@ index ------------ ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll -@@ ------------ @@ - ./sdk/x.y.z/IncludedWorkloadManifests.txt - ./sdk/x.y.z/it/ - ./sdk/x.y.z/it/dotnet.resources.dll --./sdk/x.y.z/it/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/it/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/it/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/it/System.CommandLine.resources.dll - ./sdk/x.y.z/ja/ - ./sdk/x.y.z/ja/dotnet.resources.dll --./sdk/x.y.z/ja/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/ja/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/ja/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/ja/System.CommandLine.resources.dll - ./sdk/x.y.z/ko/ - ./sdk/x.y.z/ko/dotnet.resources.dll --./sdk/x.y.z/ko/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/ko/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/ko/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/ko/System.CommandLine.resources.dll ./sdk/x.y.z/Microsoft.ApplicationInsights.dll @@ -337,30 +241,6 @@ index ------------ ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.deps.json ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll ./sdk/x.y.z/Microsoft.VisualStudioVersion.v11.Common.props -@@ ------------ @@ - ./sdk/x.y.z/package.deps.json - ./sdk/x.y.z/pl/ - ./sdk/x.y.z/pl/dotnet.resources.dll --./sdk/x.y.z/pl/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/pl/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/pl/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/pl/System.CommandLine.resources.dll - ./sdk/x.y.z/pt-BR/ - ./sdk/x.y.z/pt-BR/dotnet.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll @@ -371,18 +251,6 @@ index ------------ ./sdk/x.y.z/Roslyn/bincore/tr/ ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll - ./sdk/x.y.z/ru/ - ./sdk/x.y.z/ru/dotnet.resources.dll --./sdk/x.y.z/ru/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/ru/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/ru/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll @@ -407,6 +275,17 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.AspNetCore.Razor.Language.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.AspNetCore.Razor.LanguageSupport.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.AspNetCore.Razor.LanguageSupport.xml ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.AspNetCore.Razor.Utilities.Shared.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.AspNetCore.Razor.Utilities.Shared.xml + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.CodeAnalysis.Razor.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.NET.Sdk.Razor.SourceGenerators.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/source-generators/Microsoft.NET.Sdk.Razor.SourceGenerators.dll @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.Bcl.AsyncInterfaces.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.Extensions.FileSystemGlobbing.dll @@ -436,74 +315,7 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/icon.png -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/README.md + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll @@ -539,35 +351,4 @@ index ------------ +./sdk/x.y.z/TestHost/ ./sdk/x.y.z/tr/ ./sdk/x.y.z/tr/dotnet.resources.dll --./sdk/x.y.z/tr/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/tr/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/tr/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/vstest.console.runtimeconfig.json - ./sdk/x.y.z/zh-Hans/ - ./sdk/x.y.z/zh-Hans/dotnet.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll - ./sdk/x.y.z/zh-Hant/ - ./sdk/x.y.z/zh-Hant/dotnet.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll \ No newline at end of file + ./sdk/x.y.z/tr/Microsoft.Build.resources.dll \ No newline at end of file From 4c9bc7448c243a8954f1a70a6a8961e6187d5dd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 18:40:08 +0000 Subject: [PATCH 386/864] [main] Update dependencies from dotnet/arcade (#15659) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23121-02 to 1.2.0-beta-23125-01 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23121.1 to 1.0.0-beta.23124.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cf30d593..8fc0ca564 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade - 39952f0f2dbd76699158d5f84fc3644602ad08c9 + 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ 72584554974ece2019fbd3dd6743a282f39d9b87 - + https://github.com/dotnet/sourcelink - 401652e13a35e7f139d0df71ef75a7a737272959 + 161e4eb21f51d3c3397318cabcc9139718dea790 - + https://github.com/dotnet/xliff-tasks - c92d29d251f88bc3a9fa958efaad048bdabbf8a9 + 6d69e885ef955272edd85b4da2360335ebeb98d2 diff --git a/eng/Versions.props b/eng/Versions.props index 1ad3e99bb..dfecddbc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23123.2 + 8.0.0-beta.23127.1 diff --git a/global.json b/global.json index f70c64842..6148ab03e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23123.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23127.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23127.1" } } From 4e371c9cdac7bd4b4c3956fbd9b749c68bf36a2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 19:42:55 +0000 Subject: [PATCH 387/864] Update dependencies from https://github.com/dotnet/sdk build 20230228.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23127.19 -> To Version 7.0.300-preview.23128.3 --- 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 00d896e3a..dc67ac878 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e - + https://github.com/dotnet/sdk - 6b3d34b6fb60a72d1b0f4dbc3e8ea40711457d80 + 17b64056af48795c5dac99216ae2910456b6224e diff --git a/eng/Versions.props b/eng/Versions.props index 4d1b0b0de..ddf9ef39f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23127.19 - 7.0.300-preview.23127.19 - 7.0.300-preview.23127.19 + 7.0.300-preview.23128.3 + 7.0.300-preview.23128.3 + 7.0.300-preview.23128.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93d517d066b8bc06c876f50caa6bf84bb5c00d3d Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 28 Feb 2023 21:20:15 +0000 Subject: [PATCH 388/864] Small naming update --- .../SdkContentTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index ba7432dbe..4d02ed3ae 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -59,10 +59,10 @@ public class SdkContentTests : SmokeTests private static IEnumerable RemoveExclusions(IEnumerable files, IEnumerable exclusions) => files.Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item))); - private static IEnumerable GetExclusionFilters(string exceptionFilePath, string sdkType) + private static IEnumerable GetExclusionFilters(string exclusionsFilePath, string sdkType) { int prefixSkip = sdkType.Length + 1; - return File.ReadAllLines(exceptionFilePath) + return File.ReadAllLines(exclusionsFilePath) .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions .Select(line => { From a2dbd1cef6d571fa4ee1b0796227d37b5d1d20c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Feb 2023 22:36:53 +0000 Subject: [PATCH 389/864] Update dependencies from https://github.com/dotnet/sdk build 20230228.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23127.20 -> To Version 8.0.100-preview.3.23128.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0-preview.3.23127.4 -> To Version 8.0.0-preview.3.23127.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fc0ca564..a1df67786 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 843ad97202a7886a90557f5aa5541501b5879d61 + a7080666f5ae8ae8c24573a09d58e6c3f64b840a - + https://github.com/dotnet/windowsdesktop - 843ad97202a7886a90557f5aa5541501b5879d61 + a7080666f5ae8ae8c24573a09d58e6c3f64b840a - + https://github.com/dotnet/windowsdesktop - 843ad97202a7886a90557f5aa5541501b5879d61 + a7080666f5ae8ae8c24573a09d58e6c3f64b840a - + https://github.com/dotnet/windowsdesktop - 843ad97202a7886a90557f5aa5541501b5879d61 + a7080666f5ae8ae8c24573a09d58e6c3f64b840a https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - fbc089ea96f0187c31e9ae176278334c8d5defc6 + 033003f9fdbd09e33b3b2882c21d338d26bba88e - + https://github.com/dotnet/sdk - fbc089ea96f0187c31e9ae176278334c8d5defc6 + 033003f9fdbd09e33b3b2882c21d338d26bba88e - + https://github.com/dotnet/sdk - fbc089ea96f0187c31e9ae176278334c8d5defc6 + 033003f9fdbd09e33b3b2882c21d338d26bba88e - + https://github.com/dotnet/sdk - fbc089ea96f0187c31e9ae176278334c8d5defc6 + 033003f9fdbd09e33b3b2882c21d338d26bba88e https://github.com/dotnet/winforms 957520b0533d3085136b5599a83618cd697a088d - + https://github.com/dotnet/wpf - d8e54e5c5e5491f17bf66eb3c8bdc6505aee61ef + 36319decba28811bf1c96dffca357cb4263f5f42 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dfecddbc6..e67788039 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 8.0.0-preview.2.23126.1 + 8.0.0-preview.3.23127.2 @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23127.20 - 8.0.100-preview.3.23127.20 - 8.0.100-preview.3.23127.20 + 8.0.100-preview.3.23128.4 + 8.0.100-preview.3.23128.4 + 8.0.100-preview.3.23128.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.3.23127.4 - 8.0.0-preview.3.23127.4 - 8.0.0-preview.3.23127.4 - 8.0.0-preview.3.23127.4 + 8.0.0-preview.3.23127.5 + 8.0.0-preview.3.23127.5 + 8.0.0-preview.3.23127.5 + 8.0.0-preview.3.23127.5 From 48f27caff25df9935788ceb4d33370ae9d4b1588 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Mar 2023 10:54:41 +0000 Subject: [PATCH 390/864] Update dependencies from https://github.com/dotnet/arcade-services build 20230228.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23116.2 -> To Version 1.1.0-beta.23128.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index adcab856d..b23f9971f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23116.2", + "version": "1.1.0-beta.23128.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1df67786..8b3e27332 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,13 +208,13 @@ https://github.com/dotnet/arcade 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 - + https://github.com/dotnet/arcade-services - babaa0d787b3921bae3e97d053f6b73c74e750b0 + b2a77aac8c64f46101abc98fdb07a6131fae3625 - + https://github.com/dotnet/arcade-services - babaa0d787b3921bae3e97d053f6b73c74e750b0 + b2a77aac8c64f46101abc98fdb07a6131fae3625 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e67788039..30b6e9473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.23116.2 + 1.1.0-beta.23128.1 From 58ec7a99fa2df6c3345552ffdaf75fd7a1ab0711 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Mar 2023 16:21:54 +0000 Subject: [PATCH 391/864] Update dependencies from https://github.com/dotnet/sdk build 20230301.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23128.3 -> To Version 7.0.300-preview.23151.1 --- 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 dc67ac878..fdab276cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 - + https://github.com/dotnet/sdk - 17b64056af48795c5dac99216ae2910456b6224e + ef17fef515b44b0dbfe4078a66625381ff798154 diff --git a/eng/Versions.props b/eng/Versions.props index ddf9ef39f..f0988e009 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23128.3 - 7.0.300-preview.23128.3 - 7.0.300-preview.23128.3 + 7.0.300-preview.23151.1 + 7.0.300-preview.23151.1 + 7.0.300-preview.23151.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c964d85026c2ea305639fe250c60e5c5c60ce35e Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 1 Mar 2023 09:05:57 -0800 Subject: [PATCH 392/864] [release/7.0.1xx] SDK diff exclusions - backport (#15670) --- .../SdkContentTests.cs | 29 +- .../assets/SdkDiffExclusions.txt | 34 + .../assets/baselines/MsftToSbSdk.diff | 1156 +---------------- 3 files changed, 62 insertions(+), 1157 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index ef462619a..4d02ed3ae 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.IO.Enumeration; using System.Linq; using System.Text.RegularExpressions; using Xunit.Abstractions; @@ -27,15 +28,15 @@ public class SdkContentTests : SmokeTests { const string msftFileListingFileName = "msftSdkFiles.txt"; const string sbFileListingFileName = "sbSdkFiles.txt"; - WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true); - WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false); + WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true, "msft"); + WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false, "sb"); string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); diff = RemoveDiffMarkers(diff); BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } - private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable) + private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable, string sdkType) { if (!File.Exists(tarballPath)) { @@ -46,10 +47,32 @@ public class SdkContentTests : SmokeTests fileListing = BaselineHelper.RemoveRids(fileListing, isPortable); fileListing = BaselineHelper.RemoveVersions(fileListing); IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); + files = RemoveExclusions( + files, + GetExclusionFilters( + Path.Combine(BaselineHelper.GetAssetsDirectory(), "SdkDiffExclusions.txt"), + sdkType)); File.WriteAllLines(outputFileName, files); } + private static IEnumerable RemoveExclusions(IEnumerable files, IEnumerable exclusions) => + files.Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item))); + + private static IEnumerable GetExclusionFilters(string exclusionsFilePath, string sdkType) + { + int prefixSkip = sdkType.Length + 1; + return File.ReadAllLines(exclusionsFilePath) + .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions + .Select(line => + { + // Ignore comments + var index = line.IndexOf('#'); + return index >= 0 ? line[prefixSkip..index].TrimEnd() : line[prefixSkip..]; + }) + .ToList(); + } + private static string RemoveDiffMarkers(string source) { Regex indexRegex = new("^index .*", RegexOptions.Multiline); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt new file mode 100644 index 000000000..19f4635d1 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt @@ -0,0 +1,34 @@ +# This list is processed using FileSystemName.MatchesSimpleExpression +# +# Format +# {msft|sb}, [# comment] +# msft = Microsoft built SDK +# sb = source-built SDK +# +# Examples +# 'folder/*' matches 'folder/' and 'folder/abc' +# 'folder/?*' matches 'folder/abc' but not 'folder/' +# +# We do not want to filter-out folder entries, therefore, we should use: '?*' and not just '*' + +msft,./sdk/x.y.z/TestHostNetFramework/?* # Intentional - MSFT build includes test-host that targets netcoreapp3.1 +msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/?* # Intentional - source-build includes SDK Publishing package that target latest .NET TFM +msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/?* # Intentional - explicitly excluded from source-build +sb,./sdk/x.y.z/TestHost/?* # Intentional - source-build includes test-host that targets latest .NET TFM + +# vstest localization is disabled in Linux builds - https://github.com/microsoft/vstest/issues/4305 +msft,./sdk/x.y.z/*?/Microsoft.CodeCoverage.IO.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/*?/Test.Utility.resources.dll +msft,./sdk/x.y.z/*?/vstest.console.resources.dll +msft,./sdk/x.y.z/Extensions/*?/Microsoft.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/Extensions/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll + +# nuget localization is not available for Linux builds - https://github.com/NuGet/Home/issues/12440 +msft,./sdk/x.y.z/*?/NuGet.*?.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.Build.NuGetSdkResolver.resources.dll + +# ILMerge is not supported in Linux builds - excluding the whole NuGet.Build.Tasks.Pack directory, to avoid a noisy diff +msft,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? +sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? 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 74ad4390c..bd443698c 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 @@ -44,57 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./sdk/x.y.z/AppHostTemplate/apphost - ./sdk/x.y.z/cs/ - ./sdk/x.y.z/cs/dotnet.resources.dll --./sdk/x.y.z/cs/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/cs/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/cs/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/cs/MSBuild.resources.dll --./sdk/x.y.z/cs/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/cs/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/cs/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/cs/NuGet.Commands.resources.dll --./sdk/x.y.z/cs/NuGet.Common.resources.dll --./sdk/x.y.z/cs/NuGet.Configuration.resources.dll --./sdk/x.y.z/cs/NuGet.Credentials.resources.dll --./sdk/x.y.z/cs/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Frameworks.resources.dll --./sdk/x.y.z/cs/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/cs/NuGet.Localization.resources.dll --./sdk/x.y.z/cs/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.resources.dll --./sdk/x.y.z/cs/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/cs/NuGet.Protocol.resources.dll --./sdk/x.y.z/cs/NuGet.Resolver.resources.dll --./sdk/x.y.z/cs/NuGet.Versioning.resources.dll --./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/cs/System.CommandLine.resources.dll --./sdk/x.y.z/cs/Test.Utility.resources.dll --./sdk/x.y.z/cs/vstest.console.resources.dll - ./sdk/x.y.z/Current/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ @@ ------------ @@ ./sdk/x.y.z/datacollector.deps.json ./sdk/x.y.z/datacollector.dll @@ -103,53 +52,6 @@ index ------------ ./sdk/x.y.z/datacollector.runtimeconfig.json ./sdk/x.y.z/de/ ./sdk/x.y.z/de/dotnet.resources.dll --./sdk/x.y.z/de/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/de/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/de/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/de/MSBuild.resources.dll --./sdk/x.y.z/de/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/de/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/de/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/de/NuGet.Commands.resources.dll --./sdk/x.y.z/de/NuGet.Common.resources.dll --./sdk/x.y.z/de/NuGet.Configuration.resources.dll --./sdk/x.y.z/de/NuGet.Credentials.resources.dll --./sdk/x.y.z/de/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/de/NuGet.Frameworks.resources.dll --./sdk/x.y.z/de/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/de/NuGet.Localization.resources.dll --./sdk/x.y.z/de/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.resources.dll --./sdk/x.y.z/de/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/de/NuGet.Protocol.resources.dll --./sdk/x.y.z/de/NuGet.Resolver.resources.dll --./sdk/x.y.z/de/NuGet.Versioning.resources.dll --./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/de/System.CommandLine.resources.dll --./sdk/x.y.z/de/Test.Utility.resources.dll --./sdk/x.y.z/de/vstest.console.resources.dll - ./sdk/x.y.z/dotnet-watch.deps.json - ./sdk/x.y.z/dotnet-watch.runtimeconfig.json - ./sdk/x.y.z/dotnet.deps.json @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -252,66 +154,11 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ - ./sdk/x.y.z/DotNetWatch.targets - ./sdk/x.y.z/es/ - ./sdk/x.y.z/es/dotnet.resources.dll --./sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/es/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/es/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/es/MSBuild.resources.dll --./sdk/x.y.z/es/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/es/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/es/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/es/NuGet.Commands.resources.dll --./sdk/x.y.z/es/NuGet.Common.resources.dll --./sdk/x.y.z/es/NuGet.Configuration.resources.dll --./sdk/x.y.z/es/NuGet.Credentials.resources.dll --./sdk/x.y.z/es/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/es/NuGet.Frameworks.resources.dll --./sdk/x.y.z/es/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/es/NuGet.Localization.resources.dll --./sdk/x.y.z/es/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.resources.dll --./sdk/x.y.z/es/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/es/NuGet.Protocol.resources.dll --./sdk/x.y.z/es/NuGet.Resolver.resources.dll --./sdk/x.y.z/es/NuGet.Versioning.resources.dll --./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/es/System.CommandLine.resources.dll --./sdk/x.y.z/es/Test.Utility.resources.dll --./sdk/x.y.z/es/vstest.console.resources.dll ./sdk/x.y.z/Extensions/ -./sdk/x.y.z/Extensions/cs/ --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/de/ --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/dump/ -./sdk/x.y.z/Extensions/dump/DumpMinitool.arm64.exe -./sdk/x.y.z/Extensions/dump/DumpMinitool.arm64.exe.config @@ -320,35 +167,10 @@ index ------------ -./sdk/x.y.z/Extensions/dump/DumpMinitool.x86.exe -./sdk/x.y.z/Extensions/dump/DumpMinitool.x86.exe.config -./sdk/x.y.z/Extensions/es/ --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/fr/ --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/it/ --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ja/ --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ko/ --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll @@ -356,90 +178,14 @@ index ------------ ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll -./sdk/x.y.z/Extensions/pl/ --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/pt-BR/ --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ru/ --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/tr/ --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/zh-Hans/ --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/zh-Hant/ --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll ./sdk/x.y.z/fr/ ./sdk/x.y.z/fr/dotnet.resources.dll --./sdk/x.y.z/fr/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/fr/Microsoft.Build.resources.dll - ./sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/fr/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/fr/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/fr/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/fr/MSBuild.resources.dll --./sdk/x.y.z/fr/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/fr/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/fr/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/fr/NuGet.Commands.resources.dll --./sdk/x.y.z/fr/NuGet.Common.resources.dll --./sdk/x.y.z/fr/NuGet.Configuration.resources.dll --./sdk/x.y.z/fr/NuGet.Credentials.resources.dll --./sdk/x.y.z/fr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/fr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/fr/NuGet.Localization.resources.dll --./sdk/x.y.z/fr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.resources.dll --./sdk/x.y.z/fr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/fr/NuGet.Protocol.resources.dll --./sdk/x.y.z/fr/NuGet.Resolver.resources.dll --./sdk/x.y.z/fr/NuGet.Versioning.resources.dll --./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/fr/System.CommandLine.resources.dll --./sdk/x.y.z/fr/Test.Utility.resources.dll --./sdk/x.y.z/fr/vstest.console.resources.dll - ./sdk/x.y.z/FSharp/ - ./sdk/x.y.z/FSharp/cs/ - ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll @@ -464,149 +210,6 @@ index ------------ ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll -@@ ------------ @@ - ./sdk/x.y.z/IncludedWorkloadManifests.txt - ./sdk/x.y.z/it/ - ./sdk/x.y.z/it/dotnet.resources.dll --./sdk/x.y.z/it/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/it/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/it/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/it/MSBuild.resources.dll --./sdk/x.y.z/it/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/it/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/it/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/it/NuGet.Commands.resources.dll --./sdk/x.y.z/it/NuGet.Common.resources.dll --./sdk/x.y.z/it/NuGet.Configuration.resources.dll --./sdk/x.y.z/it/NuGet.Credentials.resources.dll --./sdk/x.y.z/it/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/it/NuGet.Frameworks.resources.dll --./sdk/x.y.z/it/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/it/NuGet.Localization.resources.dll --./sdk/x.y.z/it/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.resources.dll --./sdk/x.y.z/it/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/it/NuGet.Protocol.resources.dll --./sdk/x.y.z/it/NuGet.Resolver.resources.dll --./sdk/x.y.z/it/NuGet.Versioning.resources.dll --./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/it/System.CommandLine.resources.dll --./sdk/x.y.z/it/Test.Utility.resources.dll --./sdk/x.y.z/it/vstest.console.resources.dll - ./sdk/x.y.z/ja/ - ./sdk/x.y.z/ja/dotnet.resources.dll --./sdk/x.y.z/ja/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/ja/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/ja/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/ja/MSBuild.resources.dll --./sdk/x.y.z/ja/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ja/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ja/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ja/NuGet.Commands.resources.dll --./sdk/x.y.z/ja/NuGet.Common.resources.dll --./sdk/x.y.z/ja/NuGet.Configuration.resources.dll --./sdk/x.y.z/ja/NuGet.Credentials.resources.dll --./sdk/x.y.z/ja/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ja/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ja/NuGet.Localization.resources.dll --./sdk/x.y.z/ja/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.resources.dll --./sdk/x.y.z/ja/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ja/NuGet.Protocol.resources.dll --./sdk/x.y.z/ja/NuGet.Resolver.resources.dll --./sdk/x.y.z/ja/NuGet.Versioning.resources.dll --./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ja/System.CommandLine.resources.dll --./sdk/x.y.z/ja/Test.Utility.resources.dll --./sdk/x.y.z/ja/vstest.console.resources.dll - ./sdk/x.y.z/ko/ - ./sdk/x.y.z/ko/dotnet.resources.dll --./sdk/x.y.z/ko/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/ko/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/ko/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/ko/MSBuild.resources.dll --./sdk/x.y.z/ko/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ko/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ko/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ko/NuGet.Commands.resources.dll --./sdk/x.y.z/ko/NuGet.Common.resources.dll --./sdk/x.y.z/ko/NuGet.Configuration.resources.dll --./sdk/x.y.z/ko/NuGet.Credentials.resources.dll --./sdk/x.y.z/ko/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ko/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ko/NuGet.Localization.resources.dll --./sdk/x.y.z/ko/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.resources.dll --./sdk/x.y.z/ko/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ko/NuGet.Protocol.resources.dll --./sdk/x.y.z/ko/NuGet.Resolver.resources.dll --./sdk/x.y.z/ko/NuGet.Versioning.resources.dll --./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ko/System.CommandLine.resources.dll --./sdk/x.y.z/ko/Test.Utility.resources.dll --./sdk/x.y.z/ko/vstest.console.resources.dll - ./sdk/x.y.z/Microsoft.ApplicationInsights.dll - ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll - ./sdk/x.y.z/Microsoft.Build.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -633,103 +236,6 @@ index ------------ ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.deps.json ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll ./sdk/x.y.z/Microsoft.VisualStudioVersion.v11.Common.props -@@ ------------ @@ - ./sdk/x.y.z/package.deps.json - ./sdk/x.y.z/pl/ - ./sdk/x.y.z/pl/dotnet.resources.dll --./sdk/x.y.z/pl/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/pl/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/pl/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/pl/MSBuild.resources.dll --./sdk/x.y.z/pl/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/pl/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/pl/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/pl/NuGet.Commands.resources.dll --./sdk/x.y.z/pl/NuGet.Common.resources.dll --./sdk/x.y.z/pl/NuGet.Configuration.resources.dll --./sdk/x.y.z/pl/NuGet.Credentials.resources.dll --./sdk/x.y.z/pl/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pl/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pl/NuGet.Localization.resources.dll --./sdk/x.y.z/pl/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.resources.dll --./sdk/x.y.z/pl/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pl/NuGet.Protocol.resources.dll --./sdk/x.y.z/pl/NuGet.Resolver.resources.dll --./sdk/x.y.z/pl/NuGet.Versioning.resources.dll --./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/pl/System.CommandLine.resources.dll --./sdk/x.y.z/pl/Test.Utility.resources.dll --./sdk/x.y.z/pl/vstest.console.resources.dll - ./sdk/x.y.z/pt-BR/ - ./sdk/x.y.z/pt-BR/dotnet.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/pt-BR/MSBuild.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Commands.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Common.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Configuration.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Credentials.resources.dll --./sdk/x.y.z/pt-BR/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Localization.resources.dll --./sdk/x.y.z/pt-BR/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.resources.dll --./sdk/x.y.z/pt-BR/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Protocol.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Resolver.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll --./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll --./sdk/x.y.z/pt-BR/Test.Utility.resources.dll --./sdk/x.y.z/pt-BR/vstest.console.resources.dll - ./sdk/x.y.z/ref/ - ./sdk/x.y.z/ref/Microsoft.Build.Framework.dll - ./sdk/x.y.z/ref/Microsoft.Build.Utilities.Core.dll @@ ------------ @@ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll @@ -740,57 +246,6 @@ index ------------ ./sdk/x.y.z/Roslyn/bincore/tr/ ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll - ./sdk/x.y.z/ru/ - ./sdk/x.y.z/ru/dotnet.resources.dll --./sdk/x.y.z/ru/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/ru/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/ru/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/ru/MSBuild.resources.dll --./sdk/x.y.z/ru/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ru/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ru/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ru/NuGet.Commands.resources.dll --./sdk/x.y.z/ru/NuGet.Common.resources.dll --./sdk/x.y.z/ru/NuGet.Configuration.resources.dll --./sdk/x.y.z/ru/NuGet.Credentials.resources.dll --./sdk/x.y.z/ru/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ru/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ru/NuGet.Localization.resources.dll --./sdk/x.y.z/ru/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.resources.dll --./sdk/x.y.z/ru/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ru/NuGet.Protocol.resources.dll --./sdk/x.y.z/ru/NuGet.Resolver.resources.dll --./sdk/x.y.z/ru/NuGet.Versioning.resources.dll --./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ru/System.CommandLine.resources.dll --./sdk/x.y.z/ru/Test.Utility.resources.dll --./sdk/x.y.z/ru/vstest.console.resources.dll - ./sdk/x.y.z/RuntimeIdentifierGraph.json - ./sdk/x.y.z/runtimes/ - ./sdk/x.y.z/runtimes/any/ @@ ------------ @@ ./sdk/x.y.z/runtimes/any/native/NuGet.props ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets @@ -823,48 +278,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/ -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Bcl.AsyncInterfaces.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.NET.Sdk.Publish.Tasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.NET.Sdk.Publish.Tasks.dll.config --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Delegation.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Deployment.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Deployment.Tracing.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.XmlTransform.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Buffers.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Text.Encodings.Web.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Text.Json.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Threading.Tasks.Extensions.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.ValueTuple.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ -881,86 +294,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/Microsoft.NET.Sdk.Web.Tasks.dll -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.WinFX.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/System.Windows.Forms.Analyzers.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/THIRD-PARTY-NOTICES.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Collections.Immutable.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Reflection.Metadata.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/version.txt ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props @@ -973,100 +306,7 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/NuGet.Build.Tasks.Pack.resources.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/NuGet.Build.Tasks.Pack.resources.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/icon.png -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/README.md + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll @@ -1092,245 +332,6 @@ index ------------ ./sdk/x.y.z/testhost.deps.json ./sdk/x.y.z/testhost.dll -./sdk/x.y.z/TestHostNetFramework/ --./sdk/x.y.z/TestHostNetFramework/cs/ --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/datacollector.arm64.exe --./sdk/x.y.z/TestHostNetFramework/datacollector.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/datacollector.exe --./sdk/x.y.z/TestHostNetFramework/datacollector.exe.config --./sdk/x.y.z/TestHostNetFramework/de/ --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/ --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/ --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/ --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/ --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/ --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CommunicationUtilities.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CoreUtilities.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CrossPlatEngine.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.PlatformAbstractions.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.Utilities.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.VisualStudio.TestPlatform.Common.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll --./sdk/x.y.z/TestHostNetFramework/Microsoft.Win32.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/netstandard.dll --./sdk/x.y.z/TestHostNetFramework/Newtonsoft.Json.dll --./sdk/x.y.z/TestHostNetFramework/NuGet.Frameworks.dll --./sdk/x.y.z/TestHostNetFramework/pl/ --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/ --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/ --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/System.AppContext.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.Concurrent.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.Immutable.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.NonGeneric.dll --./sdk/x.y.z/TestHostNetFramework/System.Collections.Specialized.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.EventBasedAsync.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.TypeConverter.dll --./sdk/x.y.z/TestHostNetFramework/System.Console.dll --./sdk/x.y.z/TestHostNetFramework/System.Data.Common.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Contracts.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Debug.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.FileVersionInfo.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Process.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.StackTrace.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.TextWriterTraceListener.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Tools.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.TraceSource.dll --./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Tracing.dll --./sdk/x.y.z/TestHostNetFramework/System.Drawing.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Dynamic.Runtime.dll --./sdk/x.y.z/TestHostNetFramework/System.Globalization.Calendars.dll --./sdk/x.y.z/TestHostNetFramework/System.Globalization.dll --./sdk/x.y.z/TestHostNetFramework/System.Globalization.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.Compression.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.Compression.ZipFile.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.DriveInfo.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.Watcher.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.IsolatedStorage.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.MemoryMappedFiles.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.Pipes.dll --./sdk/x.y.z/TestHostNetFramework/System.IO.UnmanagedMemoryStream.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.Expressions.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.Parallel.dll --./sdk/x.y.z/TestHostNetFramework/System.Linq.Queryable.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Http.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.NameResolution.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.NetworkInformation.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Ping.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Requests.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Security.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.Sockets.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.WebHeaderCollection.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.WebSockets.Client.dll --./sdk/x.y.z/TestHostNetFramework/System.Net.WebSockets.dll --./sdk/x.y.z/TestHostNetFramework/System.ObjectModel.dll --./sdk/x.y.z/TestHostNetFramework/System.Private.Uri.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.Metadata.dll --./sdk/x.y.z/TestHostNetFramework/System.Reflection.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Resources.Reader.dll --./sdk/x.y.z/TestHostNetFramework/System.Resources.ResourceManager.dll --./sdk/x.y.z/TestHostNetFramework/System.Resources.Writer.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.CompilerServices.VisualC.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Handles.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.InteropServices.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.InteropServices.RuntimeInformation.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Numerics.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Formatters.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Json.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Xml.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Claims.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Algorithms.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Csp.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Encoding.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Primitives.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.X509Certificates.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.Principal.dll --./sdk/x.y.z/TestHostNetFramework/System.Security.SecureString.dll --./sdk/x.y.z/TestHostNetFramework/System.Text.Encoding.dll --./sdk/x.y.z/TestHostNetFramework/System.Text.Encoding.Extensions.dll --./sdk/x.y.z/TestHostNetFramework/System.Text.RegularExpressions.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Overlapped.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Tasks.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Tasks.Parallel.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Thread.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.ThreadPool.dll --./sdk/x.y.z/TestHostNetFramework/System.Threading.Timer.dll --./sdk/x.y.z/TestHostNetFramework/System.ValueTuple.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.ReaderWriter.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XDocument.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XmlDocument.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XmlSerializer.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XPath.dll --./sdk/x.y.z/TestHostNetFramework/System.Xml.XPath.XDocument.dll --./sdk/x.y.z/TestHostNetFramework/testhost.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.exe --./sdk/x.y.z/TestHostNetFramework/testhost.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net47.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net47.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net47.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net47.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net47.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net47.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net471.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net471.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net471.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net471.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net471.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net471.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net472.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net472.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net472.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net472.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net472.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net472.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net48.arm64.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net48.arm64.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net48.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net48.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.net48.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.net48.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/testhost.x86.exe --./sdk/x.y.z/TestHostNetFramework/testhost.x86.exe.config --./sdk/x.y.z/TestHostNetFramework/tr/ --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/x64/ --./sdk/x.y.z/TestHostNetFramework/x64/msdia140.dll --./sdk/x.y.z/TestHostNetFramework/x64/msdia140.dll.manifest --./sdk/x.y.z/TestHostNetFramework/x86/ --./sdk/x.y.z/TestHostNetFramework/x86/msdia140.dll --./sdk/x.y.z/TestHostNetFramework/x86/msdia140.dll.manifest --./sdk/x.y.z/TestHostNetFramework/zh-Hans/ --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/ --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +./sdk/x.y.z/testhost.dll.config +./sdk/x.y.z/testhost.runtimeconfig.json +./sdk/x.y.z/testhost.x86 @@ -1339,70 +340,10 @@ index ------------ +./sdk/x.y.z/testhost.x86.dll.config +./sdk/x.y.z/testhost.x86.runtimeconfig.json +./sdk/x.y.z/TestHost/ -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.PlatformAbstractions.dll -+./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll -+./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll -+./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll -+./sdk/x.y.z/TestHost/Newtonsoft.Json.dll -+./sdk/x.y.z/TestHost/NuGet.Frameworks.dll -+./sdk/x.y.z/TestHost/testhost.deps.json -+./sdk/x.y.z/TestHost/testhost.dll -+./sdk/x.y.z/TestHost/testhost.dll.config -+./sdk/x.y.z/TestHost/testhost.runtimeconfig.json -+./sdk/x.y.z/TestHost/testhost.x86 -+./sdk/x.y.z/TestHost/testhost.x86.deps.json -+./sdk/x.y.z/TestHost/testhost.x86.dll -+./sdk/x.y.z/TestHost/testhost.x86.dll.config -+./sdk/x.y.z/TestHost/testhost.x86.runtimeconfig.json ./sdk/x.y.z/tr/ ./sdk/x.y.z/tr/dotnet.resources.dll --./sdk/x.y.z/tr/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/tr/Microsoft.Build.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/tr/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/tr/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/tr/MSBuild.resources.dll --./sdk/x.y.z/tr/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/tr/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/tr/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/tr/NuGet.Commands.resources.dll --./sdk/x.y.z/tr/NuGet.Common.resources.dll --./sdk/x.y.z/tr/NuGet.Configuration.resources.dll --./sdk/x.y.z/tr/NuGet.Credentials.resources.dll --./sdk/x.y.z/tr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/tr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/tr/NuGet.Localization.resources.dll --./sdk/x.y.z/tr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.resources.dll --./sdk/x.y.z/tr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/tr/NuGet.Protocol.resources.dll --./sdk/x.y.z/tr/NuGet.Resolver.resources.dll --./sdk/x.y.z/tr/NuGet.Versioning.resources.dll --./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/tr/System.CommandLine.resources.dll --./sdk/x.y.z/tr/Test.Utility.resources.dll --./sdk/x.y.z/tr/vstest.console.resources.dll ./sdk/x.y.z/trustedroots/ ./sdk/x.y.z/trustedroots/codesignctl.pem ./sdk/x.y.z/trustedroots/timestampctl.pem @@ -1413,97 +354,4 @@ index ------------ -./sdk/x.y.z/vstest.console.exe ./sdk/x.y.z/vstest.console.runtimeconfig.json ./sdk/x.y.z/zh-Hans/ - ./sdk/x.y.z/zh-Hans/dotnet.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/zh-Hans/MSBuild.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Commands.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Common.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Configuration.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hans/Test.Utility.resources.dll --./sdk/x.y.z/zh-Hans/vstest.console.resources.dll - ./sdk/x.y.z/zh-Hant/ - ./sdk/x.y.z/zh-Hant/dotnet.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.CodeCoverage.IO.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Deployment.DotNet.Releases.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Sln.Internal.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Commands.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Common.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Configuration.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hant/Test.Utility.resources.dll --./sdk/x.y.z/zh-Hant/vstest.console.resources.dll - ./shared/ - ./shared/Microsoft.AspNetCore.App/ - ./shared/Microsoft.AspNetCore.App/x.y.z/ \ No newline at end of file + ./sdk/x.y.z/zh-Hans/dotnet.resources.dll \ No newline at end of file From 2715f10cc3f086f512b3fd444e6bef013a4807a6 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 1 Mar 2023 18:19:54 +0100 Subject: [PATCH 393/864] run sdk comparison tests in a separate pipeline --- .../source-build-sdk-content-tests.yml | 79 +++++++++++++ .../templates/jobs/sdk-comparison-tests.yml | 106 ++++++++++++++++++ .../BasicScenarioTests.cs | 4 +- .../Config.cs | 10 ++ .../DotNetWatchTests.cs | 2 +- .../OmniSharpTests.cs | 2 +- .../SkippableFactAttribute.cs | 27 ++++- .../SkippableTheoryAttribute.cs | 12 +- .../WebScenarioTests.cs | 4 +- 9 files changed, 231 insertions(+), 15 deletions(-) create mode 100644 eng/pipelines/source-build-sdk-content-tests.yml create mode 100644 eng/pipelines/templates/jobs/sdk-comparison-tests.yml diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml new file mode 100644 index 000000000..e7a6b5200 --- /dev/null +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -0,0 +1,79 @@ +trigger: none + +parameters: +- name: vmrBuildId + displayName: dotnet-dotnet build id, defaults to latest build + type: string + default: ' ' + +pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals 1es-ubuntu-2004 + +jobs: +- job: Get_Build_Information + displayName: Get installer and VMR build ids + variables: + - template: /eng/common/templates/variables/pipelines.yml + - group: Publish-Build-Assets + + steps: + - script: | + last_vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) + if [[ -z "$last_vmr_build" ]]; then + fail "Could not find a completed vmr build" + exit 1 + fi + echo "Vmr build id: '$last_vmr_build'" + + last_vmr_build=2108850 + + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $last_vmr_build --output tsv | sed "s,installer-,,g") + installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) + if [[ -z "$installer_build" ]]; then + fail "Could not find a build of installer for commit '$installer_sha'" + exit 1 + fi + + echo "Installer build id: '$installer_build'" + + echo "##vso[task.setvariable variable=InstallerBuildId;isoutput=true]$installer_build" + echo "##vso[task.setvariable variable=VmrBuildId;isoutput=true]$last_vmr_build" + name: Get Build IDs + env: + AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) + +- template: templates/jobs/sdk-comparison-tests.yml + parameters: + buildName: CentOSStream8_Offline + targetRid: centos.8-x64 + architecture: x64 + enablePoison: true + +- template: templates/jobs/sdk-comparison-tests.yml + parameters: + buildName: CentOSStream9_Offline + targetRid: centos.9-x64 + architecture: x64 + enablePoison: true + +- template: templates/jobs/sdk-comparison-tests.yml + parameters: + buildName: Fedora36_Offline + targetRid: fedora.36-x64 + architecture: x64 + enablePoison: true + +- template: templates/jobs/sdk-comparison-tests.yml + parameters: + buildName: Ubuntu2004_Offline + targetRid: ubuntu.2004-x64 + architecture: x64 + enablePoison: true + +- template: templates/jobs/sdk-comparison-tests.yml + parameters: + buildName: Debian11_Offline + targetRid: debian.11-x64 + architecture: x64 + enablePoison: true diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml new file mode 100644 index 000000000..f9bc49b11 --- /dev/null +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -0,0 +1,106 @@ +parameters: +- name: buildName + type: string + +- name: targetRid + type: string + +- name: architecture + type: string + +- name: enablePoison + type: boolean + +jobs: +- job: ${{ parameters.buildName }}_${{ parameters.architecture }} + dependsOn: Get_Build_Information + timeoutInMinutes: 150 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals 1es-ubuntu-2004 + variables: + - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates/variables/pipelines.yml + - name: InstallerBuildId + value: $[ dependencies.Get_Build_Information.outputs['ids.InstallerBuildId'] ] + - name: VmrBuildId + value: $[ dependencies.Get_Build_Information.outputs['ids.VmrBuildId'] ] + - name: TestResultsFileName + value: ${{ parameters.buildName }}_${{ parameters.architecture }}_SDKComparisonTests.trx + + steps: + - task: DownloadPipelineArtifact@2 + displayName: Download MSFT SDK + inputs: + buildType: specific + buildVersionToDownload: specific + project: internal + pipeline: $(INSTALLER_OFFICIAL_CI_PIPELINE_ID) + buildId: $(InstallerBuildId) + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + allowPartiallySucceededBuilds: true + allowFailedBuilds: true + downloadPath: $(Pipeline.Workspace)/Artifacts + checkDownloadedFiles: true + + - task: DownloadPipelineArtifact@2 + displayName: Download Source Build SDK + inputs: + buildType: specific + buildVersionToDownload: specific + project: internal + pipeline: $(DOTNET_DOTNET_CI_PIPELINE_ID) + buildId: $(VmrBuildId) + artifact: ${{ parameters.buildName }}_${{ parameters.architecture }}_Artifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-${{ parameters.targetRid }}.tar.gz' + allowPartiallySucceededBuilds: true + allowFailedBuilds: true + downloadPath: $(Pipeline.Workspace)/Artifacts + checkDownloadedFiles: true + + - script: | + set -x + + msftSdkTarballName=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + + if [[ -z $msftSdkTarballName ]]; then + fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" + exit 1 + fi + + sdkTarballName=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) + + if [[ -z $sdkTarballName ]]; then + fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" + exit 1 + fi + + eng/common/build.sh --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore + + envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msftSdkTarballName" + envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdkTarballName" + envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " + envArgs+=" -e SMOKE_TESTS_EXCLUDE_OMNISHARP=true -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} -e SMOKE_TESTS_PORTABLE_RID=linux-x64 -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= -e SMOKE_TESTS_INCLUDE=CompareMsftToSb" + poisonArg='' + + if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj $envArgs --logger:'trx;LogFileName=$(TestResultsFileName)' --logger:'console;verbosity=detailed' + displayName: Run Tests + workingDirectory: $(Build.SourcesDirectory) + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: '*.trx' + searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SdkComparisonTests_$(Agent.JobName) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index af435cfdc..1cba40b26 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -19,9 +19,9 @@ public class BasicScenarioTests : SmokeTests { public BasicScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Theory] + [SkippableTheory()] [MemberData(nameof(GetScenarioObjects))] - public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); + public void VerifyBasicScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index ec2d40ca5..64ca31e93 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -11,6 +11,7 @@ internal static class Config { public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR"; public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP"; + public const string IncludeTestsEnv = "SMOKE_TESTS_INCLUDE"; public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH"; public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID"; @@ -45,4 +46,13 @@ internal static class Config // Indicates whether the tests are being run in the context of a CI pipeline public static bool RunningInCI { get; } = bool.TryParse(Environment.GetEnvironmentVariable(RunningInCIEnv), out bool runningInCI) && runningInCI; + + public static string[] IncludedTests + { + get + { + var include = Environment.GetEnvironmentVariable(IncludeTestsEnv); + return include == null ? Array.Empty() : include.Split(','); + } + } } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 57b4e40b5..c5ba1572a 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,7 +13,7 @@ public class DotNetWatchTests : SmokeTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Fact] + [SkippableFact()] public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 56f14043b..036a6b800 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -34,7 +34,7 @@ public class OmniSharpTests : SmokeTests [InlineData(DotNetTemplate.WebApi)] [InlineData(DotNetTemplate.Worker)] [InlineData(DotNetTemplate.XUnit)] - public async void VerifyScenario(DotNetTemplate template) + public async void VerifyOmniSharpScenario(DotNetTemplate template) { await InitializeOmniSharp(); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs index 867bb77a5..9c9099ef4 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. using System; +using System.Linq; +using System.Runtime.CompilerServices; using Xunit; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -12,14 +14,29 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// internal class SkippableFactAttribute : FactAttribute { - public SkippableFactAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => - CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envName); + public SkippableFactAttribute([CallerMemberName] string name = "") => + CheckIncluded(name, (skip) => Skip = skip); - public SkippableFactAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => - CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envNames); + public SkippableFactAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => + CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envName); - public static void CheckEnvs(bool skipOnNullOrWhiteSpace, bool skipOnTrue, Action setSkip, params string[] envNames) + public SkippableFactAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => + CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envNames); + + public static void CheckIncluded(string methodName, Action setSkip) { + var included = Config.IncludedTests; + if (included.Length != 0 && !included.Contains(methodName)) + { + setSkip($"Skipping because `{methodName}` is not included"); + return; + } + } + + public static void CheckEnvs(bool skipOnNullOrWhiteSpace, bool skipOnTrue, Action setSkip, string testName, params string[] envNames) + { + CheckIncluded(testName, setSkip); + foreach (string envName in envNames) { string? envValue = Environment.GetEnvironmentVariable(envName); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs index 32a7179a1..6643204fa 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Runtime.CompilerServices; using Xunit; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -11,9 +12,12 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// internal class SkippableTheoryAttribute : TheoryAttribute { - public SkippableTheoryAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => - SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envName); + public SkippableTheoryAttribute([CallerMemberName] string testName = "") => + SkippableFactAttribute.CheckIncluded(testName, (skip) => Skip = skip); - public SkippableTheoryAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => - SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envNames); + public SkippableTheoryAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => + SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envName); + + public SkippableTheoryAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => + SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envNames); } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 56d0368f3..1d562540b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -18,9 +18,9 @@ public class WebScenarioTests : SmokeTests { public WebScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Theory] + [SkippableTheory()] [MemberData(nameof(GetScenarioObjects))] - public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); + public void VerifyWebScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); From 354e9444c69fa2abaa66ba123aea6b54d3e7416b Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 1 Mar 2023 18:26:01 +0100 Subject: [PATCH 394/864] remove parameter --- eng/pipelines/source-build-sdk-content-tests.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index e7a6b5200..058ae238b 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -1,11 +1,5 @@ trigger: none -parameters: -- name: vmrBuildId - displayName: dotnet-dotnet build id, defaults to latest build - type: string - default: ' ' - pool: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals 1es-ubuntu-2004 @@ -20,6 +14,7 @@ jobs: steps: - script: | last_vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) + if [[ -z "$last_vmr_build" ]]; then fail "Could not find a completed vmr build" exit 1 From 7c37ba3b3e6f932e458f184bee238b994edf124d Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 1 Mar 2023 18:29:13 +0100 Subject: [PATCH 395/864] pipeline vars --- eng/common/templates/variables/pipelines.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 eng/common/templates/variables/pipelines.yml diff --git a/eng/common/templates/variables/pipelines.yml b/eng/common/templates/variables/pipelines.yml new file mode 100644 index 000000000..2db47a1be --- /dev/null +++ b/eng/common/templates/variables/pipelines.yml @@ -0,0 +1,11 @@ +variables: +- name: AZDO_PROJECT + value: internal +- name: AZDO_ORG + value: https://dev.azure.com/dnceng/ +- name: INSTALLER_OFFICIAL_CI_PIPELINE_ID + value: 286 +- name: INSTALLER_TARBALL_BUILD_CI_PIPELINE_ID + value: 1011 +- name: DOTNET_DOTNET_CI_PIPELINE_ID + value: 1219 \ No newline at end of file From 78224338ac5c3a258b7c61107995ce1c67cb4338 Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Wed, 1 Mar 2023 17:30:48 +0000 Subject: [PATCH 396/864] Update source-build-sdk-content-tests.yml for Azure Pipelines --- eng/pipelines/source-build-sdk-content-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 058ae238b..1adf0c6f1 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -34,7 +34,7 @@ jobs: echo "##vso[task.setvariable variable=InstallerBuildId;isoutput=true]$installer_build" echo "##vso[task.setvariable variable=VmrBuildId;isoutput=true]$last_vmr_build" - name: Get Build IDs + displayName: Get Build IDs env: AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) From 2ac84026ee8410055fef83f851f599e04859f47c Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 1 Mar 2023 18:47:25 +0100 Subject: [PATCH 397/864] fix name --- eng/pipelines/source-build-sdk-content-tests.yml | 6 ++++-- eng/pipelines/templates/jobs/sdk-comparison-tests.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 1adf0c6f1..398d1d0bf 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -19,10 +19,11 @@ jobs: fail "Could not find a completed vmr build" exit 1 fi - echo "Vmr build id: '$last_vmr_build'" - + last_vmr_build=2108850 + echo "Vmr build id: '$last_vmr_build'" + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $last_vmr_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then @@ -35,6 +36,7 @@ jobs: echo "##vso[task.setvariable variable=InstallerBuildId;isoutput=true]$installer_build" echo "##vso[task.setvariable variable=VmrBuildId;isoutput=true]$last_vmr_build" displayName: Get Build IDs + name: Get_Build_Ids env: AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index f9bc49b11..84b8e8141 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -22,9 +22,9 @@ jobs: - template: /eng/common/templates/variables/pool-providers.yml - template: /eng/common/templates/variables/pipelines.yml - name: InstallerBuildId - value: $[ dependencies.Get_Build_Information.outputs['ids.InstallerBuildId'] ] + value: $[ dependencies.Get_Build_Information.outputs['Get_Build_Ids.InstallerBuildId'] ] - name: VmrBuildId - value: $[ dependencies.Get_Build_Information.outputs['ids.VmrBuildId'] ] + value: $[ dependencies.Get_Build_Information.outputs['Get_Build_Ids.VmrBuildId'] ] - name: TestResultsFileName value: ${{ parameters.buildName }}_${{ parameters.architecture }}_SDKComparisonTests.trx From ec4cc26b761c02933f046679d2f13e5072a93ee9 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 1 Mar 2023 18:59:43 +0100 Subject: [PATCH 398/864] skip sbartifacts tests --- .../SourceBuiltArtifactsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index 9d2833ada..2e0906335 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -13,7 +13,7 @@ public class SourceBuiltArtifactsTests : SmokeTests { public SourceBuiltArtifactsTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [Fact] + [SkippableFact()] public void VerifyVersionFile() { string outputDir = Path.Combine(Directory.GetCurrentDirectory(), "sourcebuilt-artifacts"); From 2b4c5cdb915866126a67fff0ce28e5c164923100 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 12:46:46 -0800 Subject: [PATCH 399/864] [main] Update dependencies from dotnet/arcade (#15672) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b3e27332..cf524f03c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 - + https://github.com/dotnet/arcade - 36406c3a94a46b0934fb6ea8c8d7644e9e0bbbb0 + 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 30b6e9473..cc587e4a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23127.1 + 8.0.0-beta.23128.1 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 71b66aeb8..b98202aa0 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20221220.2 + sourceIndexPackageVersion: 1.0.1-20230228.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index 6148ab03e..f00c7598e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23127.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23127.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23128.1" } } From a5fc6f048f0a203e06af80f4ecbe501a1e8a29a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:35:27 -0800 Subject: [PATCH 400/864] [main] Update dependencies from dotnet/sdk (#15677) 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 cf524f03c..a500021f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 033003f9fdbd09e33b3b2882c21d338d26bba88e + f2f528b164d9ed8d1e517c6383f725c608f8237c - + https://github.com/dotnet/sdk - 033003f9fdbd09e33b3b2882c21d338d26bba88e + f2f528b164d9ed8d1e517c6383f725c608f8237c - + https://github.com/dotnet/sdk - 033003f9fdbd09e33b3b2882c21d338d26bba88e + f2f528b164d9ed8d1e517c6383f725c608f8237c - + https://github.com/dotnet/sdk - 033003f9fdbd09e33b3b2882c21d338d26bba88e + f2f528b164d9ed8d1e517c6383f725c608f8237c @@ -151,9 +151,9 @@ 22bdff50d72eec9120bb1b68ce49668fda91d0a2 - + https://github.com/dotnet/msbuild - 49c7a8cf6dc7425ae3205cbb4e5babe15b72c005 + a8416ab58a2f2180b76d10678336ffea13ceaed5 diff --git a/eng/Versions.props b/eng/Versions.props index cc587e4a6..902f4eec2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23128.4 - 8.0.100-preview.3.23128.4 - 8.0.100-preview.3.23128.4 + 8.0.100-preview.3.23151.3 + 8.0.100-preview.3.23151.3 + 8.0.100-preview.3.23151.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4029cf45651a3cb96a9f8495a5ac6a4023215fcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Mar 2023 23:42:55 +0000 Subject: [PATCH 401/864] Update dependencies from https://github.com/dotnet/sdk build 20230301.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23151.3 -> To Version 8.0.100-preview.3.23151.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23126.1 -> To Version 12.5.0-beta.23127.2 (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 a500021f5..250540023 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - f2f528b164d9ed8d1e517c6383f725c608f8237c + 6a4b6b743b797d2083db60e4aeb57e10261fc0df - + https://github.com/dotnet/sdk - f2f528b164d9ed8d1e517c6383f725c608f8237c + 6a4b6b743b797d2083db60e4aeb57e10261fc0df - + https://github.com/dotnet/sdk - f2f528b164d9ed8d1e517c6383f725c608f8237c + 6a4b6b743b797d2083db60e4aeb57e10261fc0df - + https://github.com/dotnet/sdk - f2f528b164d9ed8d1e517c6383f725c608f8237c + 6a4b6b743b797d2083db60e4aeb57e10261fc0df @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 36319decba28811bf1c96dffca357cb4263f5f42 - + https://github.com/dotnet/fsharp - 4de2393866be1be6fa35af544c6f25a10af5ab3d + 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce - + https://github.com/dotnet/fsharp - 4de2393866be1be6fa35af544c6f25a10af5ab3d + 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce diff --git a/eng/Versions.props b/eng/Versions.props index 902f4eec2..985534547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23151.3 - 8.0.100-preview.3.23151.3 - 8.0.100-preview.3.23151.3 + 8.0.100-preview.3.23151.4 + 8.0.100-preview.3.23151.4 + 8.0.100-preview.3.23151.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f65c094b09ff86d1e27a9f24f17c3def3e9f3336 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 00:43:11 +0000 Subject: [PATCH 402/864] Update dependencies from https://github.com/dotnet/sdk build 20230301.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23151.3 -> To Version 8.0.100-preview.3.23151.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 8.0.0-preview.3.23127.5 -> To Version 8.0.0-preview.3.23128.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 250540023..9557a4e3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - a7080666f5ae8ae8c24573a09d58e6c3f64b840a + 86212bd99f2e74c1350e6fc2a68417693009c852 - + https://github.com/dotnet/windowsdesktop - a7080666f5ae8ae8c24573a09d58e6c3f64b840a + 86212bd99f2e74c1350e6fc2a68417693009c852 - + https://github.com/dotnet/windowsdesktop - a7080666f5ae8ae8c24573a09d58e6c3f64b840a + 86212bd99f2e74c1350e6fc2a68417693009c852 - + https://github.com/dotnet/windowsdesktop - a7080666f5ae8ae8c24573a09d58e6c3f64b840a + 86212bd99f2e74c1350e6fc2a68417693009c852 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6a4b6b743b797d2083db60e4aeb57e10261fc0df + 7a9f81b24c8192cb083b4935209459cb194a9b57 - + https://github.com/dotnet/sdk - 6a4b6b743b797d2083db60e4aeb57e10261fc0df + 7a9f81b24c8192cb083b4935209459cb194a9b57 - + https://github.com/dotnet/sdk - 6a4b6b743b797d2083db60e4aeb57e10261fc0df + 7a9f81b24c8192cb083b4935209459cb194a9b57 - + https://github.com/dotnet/sdk - 6a4b6b743b797d2083db60e4aeb57e10261fc0df + 7a9f81b24c8192cb083b4935209459cb194a9b57 - + https://github.com/dotnet/winforms - 957520b0533d3085136b5599a83618cd697a088d + 90721fc3bbdaa085258f526ab51bb6273a4b6b4e - + https://github.com/dotnet/wpf - 36319decba28811bf1c96dffca357cb4263f5f42 + e9ea2a378783336a3f062cb8ef52d17514736a5a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 985534547..bfc3885d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23126.1 + 8.0.0-preview.3.23127.8 - 8.0.0-preview.3.23127.2 + 8.0.0-preview.3.23128.2 @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23151.4 - 8.0.100-preview.3.23151.4 - 8.0.100-preview.3.23151.4 + 8.0.100-preview.3.23151.6 + 8.0.100-preview.3.23151.6 + 8.0.100-preview.3.23151.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.3.23127.5 - 8.0.0-preview.3.23127.5 - 8.0.0-preview.3.23127.5 - 8.0.0-preview.3.23127.5 + 8.0.0-preview.3.23128.4 + 8.0.0-preview.3.23128.4 + 8.0.0-preview.3.23128.4 + 8.0.0-preview.3.23128.4 From 8dd5db010e072607d9925c6d2feace5fb04cdbe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 02:13:08 +0000 Subject: [PATCH 403/864] Update dependencies from https://github.com/dotnet/sdk build 20230301.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23151.3 -> To Version 8.0.100-preview.3.23151.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 8.0.0-preview.3.23127.5 -> To Version 8.0.0-preview.3.23128.4 (parent: Microsoft.NET.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 9557a4e3d..352de701f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7a9f81b24c8192cb083b4935209459cb194a9b57 + 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 - + https://github.com/dotnet/sdk - 7a9f81b24c8192cb083b4935209459cb194a9b57 + 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 - + https://github.com/dotnet/sdk - 7a9f81b24c8192cb083b4935209459cb194a9b57 + 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 - + https://github.com/dotnet/sdk - 7a9f81b24c8192cb083b4935209459cb194a9b57 + 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 diff --git a/eng/Versions.props b/eng/Versions.props index bfc3885d0..e9ce28322 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23151.6 - 8.0.100-preview.3.23151.6 - 8.0.100-preview.3.23151.6 + 8.0.100-preview.3.23151.7 + 8.0.100-preview.3.23151.7 + 8.0.100-preview.3.23151.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e2d3ef563940cb342b19694076e60738b358d59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 03:13:12 +0000 Subject: [PATCH 404/864] Update dependencies from https://github.com/dotnet/sdk build 20230301.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23151.1 -> To Version 7.0.300-preview.23151.8 --- 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 fdab276cb..d3276208d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 - + https://github.com/dotnet/sdk - ef17fef515b44b0dbfe4078a66625381ff798154 + 861c2bccdb6015176f8a59c8b9d586030b2035f9 diff --git a/eng/Versions.props b/eng/Versions.props index f0988e009..a23118cf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23151.1 - 7.0.300-preview.23151.1 - 7.0.300-preview.23151.1 + 7.0.300-preview.23151.8 + 7.0.300-preview.23151.8 + 7.0.300-preview.23151.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36b5d97be1977d77bc71e8317bc68e05963b3a9e Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 2 Mar 2023 11:09:18 +0100 Subject: [PATCH 405/864] specify vmr runId --- .../source-build-sdk-content-tests.yml | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 398d1d0bf..013cf5ce3 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -4,27 +4,34 @@ pool: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals 1es-ubuntu-2004 +parameters: +- name: dotnetDotnetRunID + displayName: 'Specific dotnet-dotnet run ID' + type: string + default: ' ' + jobs: - job: Get_Build_Information displayName: Get installer and VMR build ids variables: - template: /eng/common/templates/variables/pipelines.yml - - group: Publish-Build-Assets steps: - script: | - last_vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) - - if [[ -z "$last_vmr_build" ]]; then + vmr_build=${{ replace(parameters.dotnetDotnetRunID, ' ', '') }} + + if [[ -z "$vmr_build" ]]; then + vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) + fi + + if [[ -z "$vmr_build" ]]; then fail "Could not find a completed vmr build" exit 1 fi - last_vmr_build=2108850 + echo "Vmr build id: '$vmr_build'" - echo "Vmr build id: '$last_vmr_build'" - - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $last_vmr_build --output tsv | sed "s,installer-,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $vmr_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then fail "Could not find a build of installer for commit '$installer_sha'" @@ -34,7 +41,7 @@ jobs: echo "Installer build id: '$installer_build'" echo "##vso[task.setvariable variable=InstallerBuildId;isoutput=true]$installer_build" - echo "##vso[task.setvariable variable=VmrBuildId;isoutput=true]$last_vmr_build" + echo "##vso[task.setvariable variable=VmrBuildId;isoutput=true]$vmr_build" displayName: Get Build IDs name: Get_Build_Ids env: From ea03122efe021fc28f15caed483967cec4dcad7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 10:17:47 +0000 Subject: [PATCH 406/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23151.7 -> To Version 8.0.100-preview.3.23152.1 --- 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 352de701f..7db626013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 + c5f9057c89000cd078ab3f528ce340ca71a430c7 - + https://github.com/dotnet/sdk - 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 + c5f9057c89000cd078ab3f528ce340ca71a430c7 - + https://github.com/dotnet/sdk - 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 + c5f9057c89000cd078ab3f528ce340ca71a430c7 - + https://github.com/dotnet/sdk - 89fecaf394a0ee7a5faeaae4245c7c59c39732d8 + c5f9057c89000cd078ab3f528ce340ca71a430c7 diff --git a/eng/Versions.props b/eng/Versions.props index e9ce28322..4d54936ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23151.7 - 8.0.100-preview.3.23151.7 - 8.0.100-preview.3.23151.7 + 8.0.100-preview.3.23152.1 + 8.0.100-preview.3.23152.1 + 8.0.100-preview.3.23152.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9a313e0d37feed838ae2905c4ad205f892f3135 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 2 Mar 2023 11:24:23 +0100 Subject: [PATCH 407/864] fix architecture --- eng/pipelines/source-build-sdk-content-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 013cf5ce3..1dc882456 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -78,6 +78,6 @@ jobs: - template: templates/jobs/sdk-comparison-tests.yml parameters: buildName: Debian11_Offline - targetRid: debian.11-x64 - architecture: x64 + targetRid: debian.11-arm64 + architecture: arm64 enablePoison: true From 7afd483cb13f2abaa15794e82a2d38ecdde267ac Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 2 Mar 2023 12:15:15 +0100 Subject: [PATCH 408/864] set schedule --- .../source-build-sdk-content-tests.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 1dc882456..151eb2e95 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -1,3 +1,12 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily midnight run + branches: + include: + - main + - release/* + +pr: none trigger: none pool: @@ -52,14 +61,14 @@ jobs: buildName: CentOSStream8_Offline targetRid: centos.8-x64 architecture: x64 - enablePoison: true + enablePoison: false - template: templates/jobs/sdk-comparison-tests.yml parameters: buildName: CentOSStream9_Offline targetRid: centos.9-x64 architecture: x64 - enablePoison: true + enablePoison: false - template: templates/jobs/sdk-comparison-tests.yml parameters: @@ -73,11 +82,11 @@ jobs: buildName: Ubuntu2004_Offline targetRid: ubuntu.2004-x64 architecture: x64 - enablePoison: true + enablePoison: false - template: templates/jobs/sdk-comparison-tests.yml parameters: buildName: Debian11_Offline targetRid: debian.11-arm64 architecture: arm64 - enablePoison: true + enablePoison: false From 55922247b07d6315005e4f9fb8111897ce802a25 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 2 Mar 2023 13:09:30 +0100 Subject: [PATCH 409/864] move ids --- .../source-build-sdk-content-tests.yml | 36 ---------------- .../templates/jobs/sdk-comparison-tests.yml | 41 ++++++++++++++----- 2 files changed, 31 insertions(+), 46 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 151eb2e95..5852c20f8 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -20,42 +20,6 @@ parameters: default: ' ' jobs: -- job: Get_Build_Information - displayName: Get installer and VMR build ids - variables: - - template: /eng/common/templates/variables/pipelines.yml - - steps: - - script: | - vmr_build=${{ replace(parameters.dotnetDotnetRunID, ' ', '') }} - - if [[ -z "$vmr_build" ]]; then - vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) - fi - - if [[ -z "$vmr_build" ]]; then - fail "Could not find a completed vmr build" - exit 1 - fi - - echo "Vmr build id: '$vmr_build'" - - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $vmr_build --output tsv | sed "s,installer-,,g") - installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) - if [[ -z "$installer_build" ]]; then - fail "Could not find a build of installer for commit '$installer_sha'" - exit 1 - fi - - echo "Installer build id: '$installer_build'" - - echo "##vso[task.setvariable variable=InstallerBuildId;isoutput=true]$installer_build" - echo "##vso[task.setvariable variable=VmrBuildId;isoutput=true]$vmr_build" - displayName: Get Build IDs - name: Get_Build_Ids - env: - AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) - - template: templates/jobs/sdk-comparison-tests.yml parameters: buildName: CentOSStream8_Offline diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index 84b8e8141..1f52303aa 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -13,22 +13,43 @@ parameters: jobs: - job: ${{ parameters.buildName }}_${{ parameters.architecture }} - dependsOn: Get_Build_Information timeoutInMinutes: 150 pool: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals 1es-ubuntu-2004 variables: - - template: /eng/common/templates/variables/pool-providers.yml - template: /eng/common/templates/variables/pipelines.yml - - name: InstallerBuildId - value: $[ dependencies.Get_Build_Information.outputs['Get_Build_Ids.InstallerBuildId'] ] - - name: VmrBuildId - value: $[ dependencies.Get_Build_Information.outputs['Get_Build_Ids.VmrBuildId'] ] - - name: TestResultsFileName - value: ${{ parameters.buildName }}_${{ parameters.architecture }}_SDKComparisonTests.trx - steps: + - script: | + vmr_build=${{ replace(parameters.dotnetDotnetRunID, ' ', '') }} + + if [[ -z "$vmr_build" ]]; then + vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) + fi + + if [[ -z "$vmr_build" ]]; then + fail "Could not find a completed vmr build" + exit 1 + fi + + echo "Vmr build id: '$vmr_build'" + + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $vmr_build --output tsv | sed "s,installer-,,g") + installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) + if [[ -z "$installer_build" ]]; then + fail "Could not find a build of installer for commit '$installer_sha'" + exit 1 + fi + + echo "Installer build id: '$installer_build'" + + echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" + echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build" + displayName: Get Build IDs + name: Get_Build_Ids + env: + AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) + - task: DownloadPipelineArtifact@2 displayName: Download MSFT SDK inputs: @@ -89,7 +110,7 @@ jobs: dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" fi - .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj $envArgs --logger:'trx;LogFileName=$(TestResultsFileName)' --logger:'console;verbosity=detailed' + .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed' displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) From 0d4afa4dc4622add56e004fb89dc5b0fb701c8c4 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 2 Mar 2023 13:11:58 +0100 Subject: [PATCH 410/864] param --- eng/pipelines/source-build-sdk-content-tests.yml | 5 +++++ eng/pipelines/templates/jobs/sdk-comparison-tests.yml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 5852c20f8..497f5370e 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -26,6 +26,7 @@ jobs: targetRid: centos.8-x64 architecture: x64 enablePoison: false + dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml parameters: @@ -33,6 +34,7 @@ jobs: targetRid: centos.9-x64 architecture: x64 enablePoison: false + dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml parameters: @@ -40,6 +42,7 @@ jobs: targetRid: fedora.36-x64 architecture: x64 enablePoison: true + dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml parameters: @@ -47,6 +50,7 @@ jobs: targetRid: ubuntu.2004-x64 architecture: x64 enablePoison: false + dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml parameters: @@ -54,3 +58,4 @@ jobs: targetRid: debian.11-arm64 architecture: arm64 enablePoison: false + dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index 1f52303aa..8a91b6f37 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -11,6 +11,9 @@ parameters: - name: enablePoison type: boolean +- name: dotnetDotnetRunID + type: string + jobs: - job: ${{ parameters.buildName }}_${{ parameters.architecture }} timeoutInMinutes: 150 From 6b4f69ca5a4a6e68b74ed8d22525b08c2eb3cba4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Mar 2023 13:20:38 +0000 Subject: [PATCH 411/864] Update dependencies from https://github.com/dotnet/arcade build 20230301.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23128.1 -> To Version 8.0.0-beta.23151.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23125-01 -> To Version 1.2.0-beta-23128-02 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 +++---- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 95 ++++++++++++++++---------------- global.json | 4 +- 4 files changed, 60 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 352de701f..f50b455cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b - + https://github.com/dotnet/arcade - 759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2 + bdc59254cf108e1d48451dc43bb9ebc331cdca7b https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ 72584554974ece2019fbd3dd6743a282f39d9b87 - + https://github.com/dotnet/sourcelink - 161e4eb21f51d3c3397318cabcc9139718dea790 + 1d0b20231ab9387f2b6d1c645cac30f763fdf419 - + https://github.com/dotnet/xliff-tasks - 6d69e885ef955272edd85b4da2360335ebeb98d2 + dd049b903ad1a4d53208f3767d181c28058eaa3e diff --git a/eng/Versions.props b/eng/Versions.props index e9ce28322..a7a469023 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23128.1 + 8.0.0-beta.23151.4 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index f027af759..ff113f733 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -55,7 +55,7 @@ __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" -__AlpinePackages+=" compiler-rt-static" +__AlpinePackages+=" compiler-rt" __AlpinePackages+=" numactl-dev" # runtime libraries' dependencies @@ -150,7 +150,6 @@ while :; do __BuildArch=riscv64 __AlpineArch=riscv64 __AlpinePackages="${__AlpinePackages// lldb-dev/}" - __AlpinePackages="${__AlpinePackages// compiler-rt-static/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" @@ -160,10 +159,6 @@ while :; do if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" fi - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - fi ;; ppc64le) __BuildArch=ppc64le @@ -175,10 +170,6 @@ while :; do __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - fi ;; s390x) __BuildArch=s390x @@ -190,10 +181,6 @@ while :; do __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - fi ;; x64) __BuildArch=x64 @@ -206,6 +193,7 @@ while :; do x86) __BuildArch=x86 __UbuntuArch=i386 + __AlpineArch=x86 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; lldb*) @@ -311,29 +299,8 @@ while :; do parts=(${version//./ }) __AlpineMajorVersion="${parts[0]}" __AlpineMinoVersion="${parts[1]}" - - if [[ -z "$__AlpineVersion" ]]; then - __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" - fi + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" fi - - case "$__AlpineVersion" in - 3.14) __AlpinePackages+=" llvm11-libs" ;; - 3.15) __AlpinePackages+=" llvm12-libs" ;; - 3.16) __AlpinePackages+=" llvm13-libs" ;; - 3.17) __AlpinePackages+=" llvm15-libs" ;; - edge) __AlpineLlvmLibsLookup=1 ;; - *) - if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - __AlpinePackages+=" llvm12-libs" - elif [[ "$__AlpineArch" == "riscv64" ]]; then - __AlpineLlvmLibsLookup=1 - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - else - __AlpineVersion=3.13 # 3.13 to maximize compatibility - fi - esac ;; freebsd12) __CodeName=freebsd @@ -376,10 +343,41 @@ while :; do shift done +case "$__AlpineVersion" in + 3.14) __AlpinePackages+=" llvm11-libs" ;; + 3.15) __AlpinePackages+=" llvm12-libs" ;; + 3.16) __AlpinePackages+=" llvm13-libs" ;; + 3.17) __AlpinePackages+=" llvm15-libs" ;; + edge) __AlpineLlvmLibsLookup=1 ;; + *) + if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then + echo boo + __AlpineVersion=3.15 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm12-libs" + elif [[ "$__AlpineArch" == "x86" ]]; then + __AlpineVersion=3.17 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm15-libs" + elif [[ "$__AlpineArch" == "riscv64" ]]; then + __AlpineLlvmLibsLookup=1 + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + else + __AlpineVersion=3.13 # 3.13 to maximize compatibility + __AlpinePackages+=" llvm10-libs" + + if [[ "$__AlpineArch" == "armv7" ]]; then + __AlpinePackages="${__AlpinePackages//numactl-dev/}" + fi + fi +esac + +if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then + # compiler-rt--static was merged in compiler-rt package in alpine 3.16 + # for older versions, we need compiler-rt--static, so replace the name + __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}" +fi + if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" -elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" fi __UbuntuPackages+=" ${__LLDB_Package:-}" @@ -422,26 +420,27 @@ if [[ "$__CodeName" == "alpine" ]]; then version="v$__AlpineVersion" fi + # initialize DB "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ - add $__AlpinePackages + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then - "$__ApkToolsDir/apk.static" \ + __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do - "$__ApkToolsDir/apk.static" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ - add "$name-libs" - done + search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" fi + # install all packages in one go + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + add $__AlpinePackages + rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc diff --git a/global.json b/global.json index f00c7598e..405b72a6b 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23128.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23151.4" } } From e944fdc2de7b7f6d756fc5cd56392d3da978a316 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 2 Mar 2023 15:43:22 +0100 Subject: [PATCH 412/864] don't set poison tests env var --- eng/pipelines/source-build-sdk-content-tests.yml | 5 ----- eng/pipelines/templates/jobs/sdk-comparison-tests.yml | 11 +---------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-content-tests.yml index 497f5370e..734d711f2 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-content-tests.yml @@ -25,7 +25,6 @@ jobs: buildName: CentOSStream8_Offline targetRid: centos.8-x64 architecture: x64 - enablePoison: false dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml @@ -33,7 +32,6 @@ jobs: buildName: CentOSStream9_Offline targetRid: centos.9-x64 architecture: x64 - enablePoison: false dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml @@ -41,7 +39,6 @@ jobs: buildName: Fedora36_Offline targetRid: fedora.36-x64 architecture: x64 - enablePoison: true dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml @@ -49,7 +46,6 @@ jobs: buildName: Ubuntu2004_Offline targetRid: ubuntu.2004-x64 architecture: x64 - enablePoison: false dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} - template: templates/jobs/sdk-comparison-tests.yml @@ -57,5 +53,4 @@ jobs: buildName: Debian11_Offline targetRid: debian.11-arm64 architecture: arm64 - enablePoison: false dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index 8a91b6f37..462bf3bb6 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -8,9 +8,6 @@ parameters: - name: architecture type: string -- name: enablePoison - type: boolean - - name: dotnetDotnetRunID type: string @@ -106,13 +103,7 @@ jobs: envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdkTarballName" envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " envArgs+=" -e SMOKE_TESTS_EXCLUDE_OMNISHARP=true -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} -e SMOKE_TESTS_PORTABLE_RID=linux-x64 -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= -e SMOKE_TESTS_INCLUDE=CompareMsftToSb" - poisonArg='' - - if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then - poisonArg='--poison' - dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" - fi - + .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed' displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) From 8b853a54c1920da1a421496e36c6d36b9bdd5e64 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 2 Mar 2023 07:04:12 -0800 Subject: [PATCH 413/864] [release/6.0.1xx] SDK diff exclusions - backport (#15676) --- .../SdkContentTests.cs | 31 +- .../assets/SdkDiffExclusions.txt | 33 + .../assets/baselines/MsftToSbSdk.diff | 910 +----------------- 3 files changed, 70 insertions(+), 904 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index 342a9e2f4..4d02ed3ae 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.IO.Enumeration; using System.Linq; using System.Text.RegularExpressions; using Xunit.Abstractions; @@ -27,16 +28,15 @@ public class SdkContentTests : SmokeTests { const string msftFileListingFileName = "msftSdkFiles.txt"; const string sbFileListingFileName = "sbSdkFiles.txt"; - WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true); - WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false); + WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true, "msft"); + WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false, "sb"); string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); - diff = BaselineHelper.RemoveVersions(diff); diff = RemoveDiffMarkers(diff); BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } - private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable) + private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable, string sdkType) { if (!File.Exists(tarballPath)) { @@ -45,11 +45,34 @@ public class SdkContentTests : SmokeTests string fileListing = ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"tf {tarballPath}", OutputHelper); fileListing = BaselineHelper.RemoveRids(fileListing, isPortable); + fileListing = BaselineHelper.RemoveVersions(fileListing); IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); + files = RemoveExclusions( + files, + GetExclusionFilters( + Path.Combine(BaselineHelper.GetAssetsDirectory(), "SdkDiffExclusions.txt"), + sdkType)); File.WriteAllLines(outputFileName, files); } + private static IEnumerable RemoveExclusions(IEnumerable files, IEnumerable exclusions) => + files.Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item))); + + private static IEnumerable GetExclusionFilters(string exclusionsFilePath, string sdkType) + { + int prefixSkip = sdkType.Length + 1; + return File.ReadAllLines(exclusionsFilePath) + .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions + .Select(line => + { + // Ignore comments + var index = line.IndexOf('#'); + return index >= 0 ? line[prefixSkip..index].TrimEnd() : line[prefixSkip..]; + }) + .ToList(); + } + private static string RemoveDiffMarkers(string source) { Regex indexRegex = new("^index .*", RegexOptions.Multiline); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt new file mode 100644 index 000000000..9f98e27e9 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkDiffExclusions.txt @@ -0,0 +1,33 @@ +# This list is processed using FileSystemName.MatchesSimpleExpression +# +# Format +# {msft|sb}, [# comment] +# msft = Microsoft built SDK +# sb = source-built SDK +# +# Examples +# 'folder/*' matches 'folder/' and 'folder/abc' +# 'folder/?*' matches 'folder/abc' but not 'folder/' +# +# We do not want to filter-out folder entries, therefore, we should use: '?*' and not just '*' + +msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/?* # Intentional - source-build includes SDK Publishing package that target latest .NET TFM +msft,./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/?* # Intentional - explicitly excluded from source-build + +# vstest localization is disabled in Linux builds - https://github.com/microsoft/vstest/issues/4305 +msft,./sdk/x.y.z/*?/Microsoft.CodeCoverage.IO.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/*?/Test.Utility.resources.dll +msft,./sdk/x.y.z/*?/vstest.console.resources.dll +msft,./sdk/x.y.z/Extensions/*?/Microsoft.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/Extensions/*?/Microsoft.VisualStudio.TestPlatform.*?.resources.dll +msft,./sdk/x.y.z/TestHost/*?/*?.resources.dll + +# nuget localization is not available for Linux builds - https://github.com/NuGet/Home/issues/12440 +msft,./sdk/x.y.z/*?/NuGet.*?.resources.dll +msft,./sdk/x.y.z/*?/Microsoft.Build.NuGetSdkResolver.resources.dll + +# ILMerge is not supported in Linux builds - excluding the whole NuGet.Build.Tasks.Pack directory, to avoid a noisy diff +msft,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? +sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? 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 c2ff554cc..1b86a0d2e 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 @@ -44,123 +44,22 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./sdk/x.y.z/AppHostTemplate/apphost - ./sdk/x.y.z/cs/ - ./sdk/x.y.z/cs/dotnet.resources.dll --./sdk/x.y.z/cs/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/cs/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/cs/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/cs/MSBuild.resources.dll --./sdk/x.y.z/cs/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/cs/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/cs/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/cs/NuGet.Commands.resources.dll --./sdk/x.y.z/cs/NuGet.Common.resources.dll --./sdk/x.y.z/cs/NuGet.Configuration.resources.dll --./sdk/x.y.z/cs/NuGet.Credentials.resources.dll --./sdk/x.y.z/cs/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Frameworks.resources.dll --./sdk/x.y.z/cs/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/cs/NuGet.Localization.resources.dll --./sdk/x.y.z/cs/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.resources.dll --./sdk/x.y.z/cs/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/cs/NuGet.Protocol.resources.dll --./sdk/x.y.z/cs/NuGet.Resolver.resources.dll --./sdk/x.y.z/cs/NuGet.Versioning.resources.dll --./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/cs/System.CommandLine.resources.dll --./sdk/x.y.z/cs/vstest.console.resources.dll ./sdk/x.y.z/Current/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ -@@ ------------ @@ - ./sdk/x.y.z/datacollector.runtimeconfig.json - ./sdk/x.y.z/de/ - ./sdk/x.y.z/de/dotnet.resources.dll --./sdk/x.y.z/de/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/de/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/de/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/de/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/de/MSBuild.resources.dll --./sdk/x.y.z/de/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/de/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/de/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/de/NuGet.Commands.resources.dll --./sdk/x.y.z/de/NuGet.Common.resources.dll --./sdk/x.y.z/de/NuGet.Configuration.resources.dll --./sdk/x.y.z/de/NuGet.Credentials.resources.dll --./sdk/x.y.z/de/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/de/NuGet.Frameworks.resources.dll --./sdk/x.y.z/de/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/de/NuGet.Localization.resources.dll --./sdk/x.y.z/de/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.resources.dll --./sdk/x.y.z/de/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/de/NuGet.Protocol.resources.dll --./sdk/x.y.z/de/NuGet.Resolver.resources.dll --./sdk/x.y.z/de/NuGet.Versioning.resources.dll --./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/de/System.CommandLine.resources.dll --./sdk/x.y.z/de/vstest.console.resources.dll ./sdk/x.y.z/dotnet-watch.deps.json - ./sdk/x.y.z/dotnet-watch.runtimeconfig.json - ./sdk/x.y.z/dotnet.deps.json -@@ ------------ @@ - ./sdk/x.y.z/dotnet.runtimeconfig.json - ./sdk/x.y.z/DotnetTools/ - ./sdk/x.y.z/DotnetTools/dotnet-dev-certs/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml - ./sdk/x.y.z/DotnetTools/dotnet-format/ - ./sdk/x.y.z/DotnetTools/dotnet-format/cs/ - ./sdk/x.y.z/DotnetTools/dotnet-format/cs/dotnet-format.resources.dll @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll @@ -193,49 +92,9 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ @@ -276,93 +135,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotNetWatch.targets - ./sdk/x.y.z/es/ - ./sdk/x.y.z/es/dotnet.resources.dll --./sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/es/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/es/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/es/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/es/MSBuild.resources.dll --./sdk/x.y.z/es/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/es/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/es/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/es/NuGet.Commands.resources.dll --./sdk/x.y.z/es/NuGet.Common.resources.dll --./sdk/x.y.z/es/NuGet.Configuration.resources.dll --./sdk/x.y.z/es/NuGet.Credentials.resources.dll --./sdk/x.y.z/es/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/es/NuGet.Frameworks.resources.dll --./sdk/x.y.z/es/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/es/NuGet.Localization.resources.dll --./sdk/x.y.z/es/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.resources.dll --./sdk/x.y.z/es/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/es/NuGet.Protocol.resources.dll --./sdk/x.y.z/es/NuGet.Resolver.resources.dll --./sdk/x.y.z/es/NuGet.Versioning.resources.dll --./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/es/System.CommandLine.resources.dll --./sdk/x.y.z/es/vstest.console.resources.dll ./sdk/x.y.z/Extensions/ -./sdk/x.y.z/Extensions/cs/ --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/de/ --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/es/ --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/fr/ --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/it/ --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ja/ --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ko/ --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll @@ -370,86 +157,22 @@ index ------------ ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll -./sdk/x.y.z/Extensions/pl/ --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/pt-BR/ --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/ru/ --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/tr/ --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/zh-Hans/ --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll -./sdk/x.y.z/Extensions/zh-Hant/ --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll ./sdk/x.y.z/fr/ ./sdk/x.y.z/fr/dotnet.resources.dll --./sdk/x.y.z/fr/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/fr/Microsoft.Build.resources.dll - ./sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/fr/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/fr/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/fr/MSBuild.resources.dll --./sdk/x.y.z/fr/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/fr/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/fr/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/fr/NuGet.Commands.resources.dll --./sdk/x.y.z/fr/NuGet.Common.resources.dll --./sdk/x.y.z/fr/NuGet.Configuration.resources.dll --./sdk/x.y.z/fr/NuGet.Credentials.resources.dll --./sdk/x.y.z/fr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/fr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/fr/NuGet.Localization.resources.dll --./sdk/x.y.z/fr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.resources.dll --./sdk/x.y.z/fr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/fr/NuGet.Protocol.resources.dll --./sdk/x.y.z/fr/NuGet.Resolver.resources.dll --./sdk/x.y.z/fr/NuGet.Versioning.resources.dll --./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/fr/System.CommandLine.resources.dll --./sdk/x.y.z/fr/vstest.console.resources.dll ./sdk/x.y.z/FSharp/ - ./sdk/x.y.z/FSharp/cs/ - ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/FSharp/Microsoft.FSharp.Targets ./sdk/x.y.z/FSharp/Microsoft.NET.StringTools.dll @@ -488,137 +211,30 @@ index ------------ ./sdk/x.y.z/FSharp/tr/ ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll ./sdk/x.y.z/FSharp/tr/FSharp.Compiler.Interactive.Settings.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/IncludedWorkloadManifests.txt - ./sdk/x.y.z/it/ - ./sdk/x.y.z/it/dotnet.resources.dll --./sdk/x.y.z/it/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/it/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/it/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/it/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/it/MSBuild.resources.dll --./sdk/x.y.z/it/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/it/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/it/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/it/NuGet.Commands.resources.dll --./sdk/x.y.z/it/NuGet.Common.resources.dll --./sdk/x.y.z/it/NuGet.Configuration.resources.dll --./sdk/x.y.z/it/NuGet.Credentials.resources.dll --./sdk/x.y.z/it/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/it/NuGet.Frameworks.resources.dll --./sdk/x.y.z/it/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/it/NuGet.Localization.resources.dll --./sdk/x.y.z/it/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.resources.dll --./sdk/x.y.z/it/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/it/NuGet.Protocol.resources.dll --./sdk/x.y.z/it/NuGet.Resolver.resources.dll --./sdk/x.y.z/it/NuGet.Versioning.resources.dll --./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/it/System.CommandLine.resources.dll --./sdk/x.y.z/it/vstest.console.resources.dll ./sdk/x.y.z/ja/ - ./sdk/x.y.z/ja/dotnet.resources.dll --./sdk/x.y.z/ja/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ja/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/ja/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/ja/MSBuild.resources.dll --./sdk/x.y.z/ja/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ja/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ja/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ja/NuGet.Commands.resources.dll --./sdk/x.y.z/ja/NuGet.Common.resources.dll --./sdk/x.y.z/ja/NuGet.Configuration.resources.dll --./sdk/x.y.z/ja/NuGet.Credentials.resources.dll --./sdk/x.y.z/ja/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ja/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ja/NuGet.Localization.resources.dll --./sdk/x.y.z/ja/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.resources.dll --./sdk/x.y.z/ja/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ja/NuGet.Protocol.resources.dll --./sdk/x.y.z/ja/NuGet.Resolver.resources.dll --./sdk/x.y.z/ja/NuGet.Versioning.resources.dll --./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ja/System.CommandLine.resources.dll --./sdk/x.y.z/ja/vstest.console.resources.dll ./sdk/x.y.z/ko/ - ./sdk/x.y.z/ko/dotnet.resources.dll --./sdk/x.y.z/ko/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ko/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/ko/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/ko/MSBuild.resources.dll --./sdk/x.y.z/ko/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ko/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ko/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ko/NuGet.Commands.resources.dll --./sdk/x.y.z/ko/NuGet.Common.resources.dll --./sdk/x.y.z/ko/NuGet.Configuration.resources.dll --./sdk/x.y.z/ko/NuGet.Credentials.resources.dll --./sdk/x.y.z/ko/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ko/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ko/NuGet.Localization.resources.dll --./sdk/x.y.z/ko/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.resources.dll --./sdk/x.y.z/ko/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ko/NuGet.Protocol.resources.dll --./sdk/x.y.z/ko/NuGet.Resolver.resources.dll --./sdk/x.y.z/ko/NuGet.Versioning.resources.dll --./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ko/System.CommandLine.resources.dll --./sdk/x.y.z/ko/vstest.console.resources.dll ./sdk/x.y.z/Microsoft.ApplicationInsights.dll - ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll - ./sdk/x.y.z/Microsoft.Build.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.DotNet.NativeWrapper.dll ./sdk/x.y.z/Microsoft.DotNet.SdkResolver.dll @@ -653,92 +269,21 @@ index ------------ ./sdk/x.y.z/Microsoft/ ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/ ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.ConflictResolution.targets -@@ ------------ @@ - ./sdk/x.y.z/package.deps.json - ./sdk/x.y.z/pl/ - ./sdk/x.y.z/pl/dotnet.resources.dll --./sdk/x.y.z/pl/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/pl/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/pl/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/pl/MSBuild.resources.dll --./sdk/x.y.z/pl/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/pl/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/pl/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/pl/NuGet.Commands.resources.dll --./sdk/x.y.z/pl/NuGet.Common.resources.dll --./sdk/x.y.z/pl/NuGet.Configuration.resources.dll --./sdk/x.y.z/pl/NuGet.Credentials.resources.dll --./sdk/x.y.z/pl/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pl/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pl/NuGet.Localization.resources.dll --./sdk/x.y.z/pl/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.resources.dll --./sdk/x.y.z/pl/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pl/NuGet.Protocol.resources.dll --./sdk/x.y.z/pl/NuGet.Resolver.resources.dll --./sdk/x.y.z/pl/NuGet.Versioning.resources.dll --./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/pl/System.CommandLine.resources.dll --./sdk/x.y.z/pl/vstest.console.resources.dll ./sdk/x.y.z/pt-BR/ - ./sdk/x.y.z/pt-BR/dotnet.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/pt-BR/MSBuild.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Commands.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Common.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Configuration.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Credentials.resources.dll --./sdk/x.y.z/pt-BR/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Localization.resources.dll --./sdk/x.y.z/pt-BR/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.resources.dll --./sdk/x.y.z/pt-BR/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Protocol.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Resolver.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll --./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll --./sdk/x.y.z/pt-BR/vstest.console.resources.dll ./sdk/x.y.z/ref/ +./sdk/x.y.z/ref/Microsoft.TestPlatform.PlatformAbstractions.dll +./sdk/x.y.z/ref/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll @@ -761,53 +306,14 @@ index ------------ ./sdk/x.y.z/Roslyn/bincore/tr/ ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll - ./sdk/x.y.z/ru/ - ./sdk/x.y.z/ru/dotnet.resources.dll --./sdk/x.y.z/ru/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/ru/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/ru/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/ru/MSBuild.resources.dll --./sdk/x.y.z/ru/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/ru/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/ru/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/ru/NuGet.Commands.resources.dll --./sdk/x.y.z/ru/NuGet.Common.resources.dll --./sdk/x.y.z/ru/NuGet.Configuration.resources.dll --./sdk/x.y.z/ru/NuGet.Credentials.resources.dll --./sdk/x.y.z/ru/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ru/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ru/NuGet.Localization.resources.dll --./sdk/x.y.z/ru/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.resources.dll --./sdk/x.y.z/ru/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ru/NuGet.Protocol.resources.dll --./sdk/x.y.z/ru/NuGet.Resolver.resources.dll --./sdk/x.y.z/ru/NuGet.Versioning.resources.dll --./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ru/System.CommandLine.resources.dll --./sdk/x.y.z/ru/vstest.console.resources.dll ./sdk/x.y.z/RuntimeIdentifierGraph.json - ./sdk/x.y.z/runtimes/ - ./sdk/x.y.z/runtimes/any/ @@ ------------ @@ ./sdk/x.y.z/runtimes/any/native/NuGet.props ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets @@ -822,11 +328,6 @@ index ------------ +./sdk/x.y.z/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ./sdk/x.y.z/runtimes/win/ ./sdk/x.y.z/runtimes/win/lib/ - ./sdk/x.y.z/runtimes/win/lib/netx.y/ - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll @@ -834,6 +335,11 @@ index ------------ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/ + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache ./sdk/x.y.z/SdkResolvers/ @@ -851,48 +357,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/ -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Bcl.AsyncInterfaces.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.NET.Sdk.Publish.Tasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.NET.Sdk.Publish.Tasks.dll.config --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Delegation.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Deployment.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.Deployment.Tracing.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/Microsoft.Web.XmlTransform.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Buffers.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Text.Encodings.Web.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Text.Json.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.Threading.Tasks.Extensions.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/System.ValueTuple.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ -931,86 +395,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/Microsoft.NET.Sdk.Web.Tasks.dll -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.WinFX.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/System.Windows.Forms.Analyzers.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/THIRD-PARTY-NOTICES.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Collections.Immutable.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Reflection.Metadata.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/net472/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/version.txt ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props @@ -1023,99 +407,7 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/NuGet.Build.Tasks.Pack.resources.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/NuGet.Build.Tasks.Pack.resources.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/icon.png -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.Configuration.ConfigurationManager.dll @@ -1144,56 +436,14 @@ index ------------ +./sdk/x.y.z/testhost.x86.runtimeconfig.json ./sdk/x.y.z/TestHost/ -./sdk/x.y.z/TestHost/cs/ --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/datacollector.exe -./sdk/x.y.z/TestHost/datacollector.exe.config -./sdk/x.y.z/TestHost/de/ --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/es/ --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/fr/ --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/it/ --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/ja/ --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/ko/ --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll @@ -1205,26 +455,8 @@ index ------------ ./sdk/x.y.z/TestHost/Newtonsoft.Json.dll ./sdk/x.y.z/TestHost/NuGet.Frameworks.dll -./sdk/x.y.z/TestHost/pl/ --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/pt-BR/ --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/ru/ --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/System.Collections.Immutable.dll -./sdk/x.y.z/TestHost/System.Reflection.Metadata.dll -./sdk/x.y.z/TestHost/testhost.exe @@ -1264,12 +496,6 @@ index ------------ -./sdk/x.y.z/TestHost/testhost.x86.exe -./sdk/x.y.z/TestHost/testhost.x86.exe.config -./sdk/x.y.z/TestHost/tr/ --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/x64/ -./sdk/x.y.z/TestHost/x64/msdia140.dll -./sdk/x.y.z/TestHost/x64/msdia140.dll.manifest @@ -1277,19 +503,7 @@ index ------------ -./sdk/x.y.z/TestHost/x86/msdia140.dll -./sdk/x.y.z/TestHost/x86/msdia140.dll.manifest -./sdk/x.y.z/TestHost/zh-Hans/ --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -./sdk/x.y.z/TestHost/zh-Hant/ --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +./sdk/x.y.z/TestHost/ref/ +./sdk/x.y.z/TestHost/ref/testhost.dll +./sdk/x.y.z/TestHost/ref/testhost.x86.dll @@ -1304,135 +518,31 @@ index ------------ +./sdk/x.y.z/TestHost/testhost.x86.runtimeconfig.json ./sdk/x.y.z/tr/ ./sdk/x.y.z/tr/dotnet.resources.dll --./sdk/x.y.z/tr/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/tr/Microsoft.Build.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/tr/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/tr/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/tr/MSBuild.resources.dll --./sdk/x.y.z/tr/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/tr/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/tr/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/tr/NuGet.Commands.resources.dll --./sdk/x.y.z/tr/NuGet.Common.resources.dll --./sdk/x.y.z/tr/NuGet.Configuration.resources.dll --./sdk/x.y.z/tr/NuGet.Credentials.resources.dll --./sdk/x.y.z/tr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/tr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/tr/NuGet.Localization.resources.dll --./sdk/x.y.z/tr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.resources.dll --./sdk/x.y.z/tr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/tr/NuGet.Protocol.resources.dll --./sdk/x.y.z/tr/NuGet.Resolver.resources.dll --./sdk/x.y.z/tr/NuGet.Versioning.resources.dll --./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/tr/System.CommandLine.resources.dll --./sdk/x.y.z/tr/vstest.console.resources.dll +./sdk/x.y.z/vstest.console ./sdk/x.y.z/vstest.console.deps.json ./sdk/x.y.z/vstest.console.dll ./sdk/x.y.z/vstest.console.dll.config - ./sdk/x.y.z/vstest.console.runtimeconfig.json - ./sdk/x.y.z/zh-Hans/ - ./sdk/x.y.z/zh-Hans/dotnet.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/zh-Hans/MSBuild.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Commands.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Common.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Configuration.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hans/vstest.console.resources.dll ./sdk/x.y.z/zh-Hant/ - ./sdk/x.y.z/zh-Hant/dotnet.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.Build.NuGetSdkResolver.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll @@ ------------ @@ ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.Console.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.CommandLine.XPlat.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Commands.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Common.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Configuration.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hant/vstest.console.resources.dll - ./shared/ - ./shared/Microsoft.AspNetCore.App/ -@@ ------------ @@ + ./shared/ \ No newline at end of file From 8b0ffb36c020f7edc5b0b667c3042a491241d567 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 2 Mar 2023 14:08:27 -0600 Subject: [PATCH 414/864] Port 8.0 Preview 2 source-build fixes to main (#15687) --- src/SourceBuild/content/eng/Versions.props | 2 +- ...01-Patch-to-prevent-WPF-from-loading.patch | 23 +++++++++++++++ ...1-Fix-for-item-based-msbuild-pattern.patch | 29 +++++++++++++++++++ .../sdk/0001-Update-BroswerRefresh-TFM.patch | 23 +++++++++++++++ 4 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch create mode 100644 src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch create mode 100644 src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 58aeb46aa..e466a9189 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -25,6 +25,6 @@ necessary, and this property is removed from the file. --> 0.1.0-8.0.100-5.centos.8-x64 - 0.1.0-8.0.100-6.centos.8-x64 + 0.1.0-8.0.100-8.centos.8-x64 diff --git a/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch b/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch new file mode 100644 index 000000000..29e3a2545 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 1 Mar 2023 00:59:46 +0000 +Subject: [PATCH] Patch to prevent WPF from loading + +Backport: https://github.com/dotnet/source-build/issues/3280 +--- + src/Tools/IdeBenchmarks/IdeBenchmarks.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj +index cf0e1886b83..2ee6d355401 100644 +--- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj ++++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj +@@ -7,7 +7,7 @@ + net472 + false + $(NoWarn),CA2007 +- true ++ true + + + diff --git a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch new file mode 100644 index 000000000..f5e666d76 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 1 Mar 2023 00:08:32 +0000 +Subject: [PATCH] Fix for item-based msbuild pattern + +Backport: https://github.com/dotnet/runtime/issues/82795 +--- + src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets +index 251336540b5..72a3537a5ce 100644 +--- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets ++++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets +@@ -346,7 +346,13 @@ Copyright (c) .NET Foundation. All rights reserved. + _CreateR2RImages; + _CreateR2RSymbols"> + +- ++ ++ <_R2RCrossgenTelemetry Include="PublishReadyToRunUseCrossgen2" Value="$(PublishReadyToRunUseCrossgen2)" /> ++ <_R2RCrossgenTelemetry Include="Crossgen2PackVersion" Value="%(ResolvedCrossgen2Pack.NuGetPackageVersion)" /> ++ <_R2RCrossgenTelemetry Include="CompileListCount" Value="@(_ReadyToRunCompileList->Count())" /> ++ <_R2RCrossgenTelemetry Include="FailedCount" Value="@(_ReadyToRunCompilationFailures->Count())" /> ++ ++ + + + diff --git a/src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch b/src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch new file mode 100644 index 000000000..f7c046b76 --- /dev/null +++ b/src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Wed, 1 Mar 2023 01:12:26 +0000 +Subject: [PATCH] Update BroswerRefresh TFM + +Backport: https://github.com/dotnet/sdk/issues/30272 +--- + .../Microsoft.AspNetCore.Watch.BrowserRefresh.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj +index fc35c0ec3d..6e429eb963 100644 +--- a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj ++++ b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + MicrosoftAspNetCore + + false From 7476c7f5427b97aefabe3d7c573496215f4074d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 03:00:48 +0000 Subject: [PATCH 415/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23151.8 -> To Version 7.0.300-preview.23152.2 --- 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 d3276208d..941d845f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 - + https://github.com/dotnet/sdk - 861c2bccdb6015176f8a59c8b9d586030b2035f9 + 740ae87c81b8aed3da0821611186cb94b29a8f74 diff --git a/eng/Versions.props b/eng/Versions.props index a23118cf4..25b671627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23151.8 - 7.0.300-preview.23151.8 - 7.0.300-preview.23151.8 + 7.0.300-preview.23152.2 + 7.0.300-preview.23152.2 + 7.0.300-preview.23152.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From adb2ac6f52a7cc5efe31d05588d9eac9d0f75bf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 04:57:58 +0000 Subject: [PATCH 416/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23151.8 -> To Version 7.0.300-preview.23152.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-2.23127.9 -> To Version 4.6.0-3.23152.5 (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 941d845f8..9f9d5e0ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 - + https://github.com/dotnet/sdk - 740ae87c81b8aed3da0821611186cb94b29a8f74 + a97e6a95d9707bfdc600d95a046f03e369c172a2 @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 22bdff50d72eec9120bb1b68ce49668fda91d0a2 + 81404ba772fe054b1ccd1b4cc67a59d44967c926 - + https://github.com/dotnet/msbuild - 49c7a8cf6dc7425ae3205cbb4e5babe15b72c005 + 47a712160eb420136ec983be5e0f412dc1c25b55 diff --git a/eng/Versions.props b/eng/Versions.props index 25b671627..8af130605 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23152.2 - 7.0.300-preview.23152.2 - 7.0.300-preview.23152.2 + 7.0.300-preview.23152.5 + 7.0.300-preview.23152.5 + 7.0.300-preview.23152.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c981c3e956ed2ebd1cdc4d6aa8d80472319e039 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 05:46:49 +0000 Subject: [PATCH 417/864] [main] Update dependencies from dotnet/sdk (#15691) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.3.23128.4 to 8.0.0-preview.3.23151.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.3.23128.4 to 8.0.0-preview.3.23151.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.3.23128.4 to 8.0.0-preview.3.23151.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23128.4 to 8.0.0-preview.3.23151.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.3.23127.8 to 8.0.0-preview.3.23128.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23128.4 to 8.0.0-preview.3.23151.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.3.23128.2 to 8.0.0-preview.3.23151.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c85781c9..c3531ad6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 86212bd99f2e74c1350e6fc2a68417693009c852 + b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c - + https://github.com/dotnet/windowsdesktop - 86212bd99f2e74c1350e6fc2a68417693009c852 + b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c - + https://github.com/dotnet/windowsdesktop - 86212bd99f2e74c1350e6fc2a68417693009c852 + b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c - + https://github.com/dotnet/windowsdesktop - 86212bd99f2e74c1350e6fc2a68417693009c852 + b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c5f9057c89000cd078ab3f528ce340ca71a430c7 + 58b78dc90b175e99074c401aa9f6720169f032d6 - + https://github.com/dotnet/sdk - c5f9057c89000cd078ab3f528ce340ca71a430c7 + 58b78dc90b175e99074c401aa9f6720169f032d6 - + https://github.com/dotnet/sdk - c5f9057c89000cd078ab3f528ce340ca71a430c7 + 58b78dc90b175e99074c401aa9f6720169f032d6 - + https://github.com/dotnet/sdk - c5f9057c89000cd078ab3f528ce340ca71a430c7 + 58b78dc90b175e99074c401aa9f6720169f032d6 - + https://github.com/dotnet/winforms - 90721fc3bbdaa085258f526ab51bb6273a4b6b4e + 83f3a8476d682f8b74c7dce5505cc39560298447 - + https://github.com/dotnet/wpf - e9ea2a378783336a3f062cb8ef52d17514736a5a + f76bd1c3f822ff6a4846d606afd9a2224e4f5902 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fc52cd002..eb39d3de3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23127.8 + 8.0.0-preview.3.23128.8 - 8.0.0-preview.3.23128.2 + 8.0.0-preview.3.23151.1 @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23152.1 - 8.0.100-preview.3.23152.1 - 8.0.100-preview.3.23152.1 + 8.0.100-preview.3.23152.4 + 8.0.100-preview.3.23152.4 + 8.0.100-preview.3.23152.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.3.23128.4 - 8.0.0-preview.3.23128.4 - 8.0.0-preview.3.23128.4 - 8.0.0-preview.3.23128.4 + 8.0.0-preview.3.23151.3 + 8.0.0-preview.3.23151.3 + 8.0.0-preview.3.23151.3 + 8.0.0-preview.3.23151.3 From 5a2485c8992aa75566b95c9ad2a65e114d64b74b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 05:52:05 +0000 Subject: [PATCH 418/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23152.6 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23151-03 -> To Version 17.6.0-preview-23152-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 c3531ad6f..6b219a3c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 58b78dc90b175e99074c401aa9f6720169f032d6 + 66d9755784000734a54413ab241027d04f78fa8d - + https://github.com/dotnet/sdk - 58b78dc90b175e99074c401aa9f6720169f032d6 + 66d9755784000734a54413ab241027d04f78fa8d - + https://github.com/dotnet/sdk - 58b78dc90b175e99074c401aa9f6720169f032d6 + 66d9755784000734a54413ab241027d04f78fa8d - + https://github.com/dotnet/sdk - 58b78dc90b175e99074c401aa9f6720169f032d6 + 66d9755784000734a54413ab241027d04f78fa8d @@ -151,9 +151,9 @@ 22bdff50d72eec9120bb1b68ce49668fda91d0a2 - + https://github.com/dotnet/msbuild - a8416ab58a2f2180b76d10678336ffea13ceaed5 + 47a712160eb420136ec983be5e0f412dc1c25b55 diff --git a/eng/Versions.props b/eng/Versions.props index eb39d3de3..f5020e1d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23152.4 - 8.0.100-preview.3.23152.4 - 8.0.100-preview.3.23152.4 + 8.0.100-preview.3.23152.6 + 8.0.100-preview.3.23152.6 + 8.0.100-preview.3.23152.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83806b274e56a33369d4fb8362f20730d1d17e82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 06:52:50 +0000 Subject: [PATCH 419/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23152.7 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23127.13 -> To Version 8.0.0-preview.3.23152.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b219a3c9..8ae1ac111 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 - + https://github.com/dotnet/aspnetcore - 3265dc6a9b05c74b199aa39351e5413317df9ad5 + f7628d4b846ab3a8961cd0f59d97689daa831041 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 66d9755784000734a54413ab241027d04f78fa8d + 69d8ab42d180c9e12b017b394439caef0d2223ae - + https://github.com/dotnet/sdk - 66d9755784000734a54413ab241027d04f78fa8d + 69d8ab42d180c9e12b017b394439caef0d2223ae - + https://github.com/dotnet/sdk - 66d9755784000734a54413ab241027d04f78fa8d + 69d8ab42d180c9e12b017b394439caef0d2223ae - + https://github.com/dotnet/sdk - 66d9755784000734a54413ab241027d04f78fa8d + 69d8ab42d180c9e12b017b394439caef0d2223ae @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/roslyn - 22bdff50d72eec9120bb1b68ce49668fda91d0a2 + 81404ba772fe054b1ccd1b4cc67a59d44967c926 diff --git a/eng/Versions.props b/eng/Versions.props index f5020e1d0..8b5299192 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23127.13 - 8.0.0-preview.3.23127.13 - 8.0.0-preview.3.23127.13 - 8.0.0-preview.3.23127.13 - 8.0.0-preview.3.23127.13 - 8.0.0-preview.3.23127.13 - 8.0.0-preview.3.23127.13 + 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.9 0.2.0 - 8.0.100-preview.3.23152.6 - 8.0.100-preview.3.23152.6 - 8.0.100-preview.3.23152.6 + 8.0.100-preview.3.23152.7 + 8.0.100-preview.3.23152.7 + 8.0.100-preview.3.23152.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 35995fea65c04b63379e32717a0482228e12beb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 07:30:18 +0000 Subject: [PATCH 420/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23152.8 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23127.13 -> To Version 8.0.0-preview.3.23152.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ae1ac111..3eff8aa8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 - + https://github.com/dotnet/aspnetcore - f7628d4b846ab3a8961cd0f59d97689daa831041 + 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 69d8ab42d180c9e12b017b394439caef0d2223ae + 534d4b7df328c572e8e9075d89889581b5111122 - + https://github.com/dotnet/sdk - 69d8ab42d180c9e12b017b394439caef0d2223ae + 534d4b7df328c572e8e9075d89889581b5111122 - + https://github.com/dotnet/sdk - 69d8ab42d180c9e12b017b394439caef0d2223ae + 534d4b7df328c572e8e9075d89889581b5111122 - + https://github.com/dotnet/sdk - 69d8ab42d180c9e12b017b394439caef0d2223ae + 534d4b7df328c572e8e9075d89889581b5111122 diff --git a/eng/Versions.props b/eng/Versions.props index 8b5299192..3705131e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23152.9 - 8.0.0-preview.3.23152.9 - 8.0.0-preview.3.23152.9 - 8.0.0-preview.3.23152.9 - 8.0.0-preview.3.23152.9 - 8.0.0-preview.3.23152.9 - 8.0.0-preview.3.23152.9 + 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23152.10 0.2.0 - 8.0.100-preview.3.23152.7 - 8.0.100-preview.3.23152.7 - 8.0.100-preview.3.23152.7 + 8.0.100-preview.3.23152.8 + 8.0.100-preview.3.23152.8 + 8.0.100-preview.3.23152.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 589252f4ba004511b6b916f147349dfb6d2ae33d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 08:51:29 +0000 Subject: [PATCH 421/864] Update dependencies from https://github.com/dotnet/sdk build 20230302.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23152.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23151.3 -> To Version 8.0.0-preview.3.23152.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3eff8aa8c..535e2393c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c + 3d0d6c89067692549e98e04b8cd924824920a170 - + https://github.com/dotnet/windowsdesktop - b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c + 3d0d6c89067692549e98e04b8cd924824920a170 - + https://github.com/dotnet/windowsdesktop - b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c + 3d0d6c89067692549e98e04b8cd924824920a170 - + https://github.com/dotnet/windowsdesktop - b2e1a5827dcf3abd48d95eb070ae8f00eea72c9c + 3d0d6c89067692549e98e04b8cd924824920a170 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 534d4b7df328c572e8e9075d89889581b5111122 + 76296007de509ede836e8d27481ef68c987e5faa - + https://github.com/dotnet/sdk - 534d4b7df328c572e8e9075d89889581b5111122 + 76296007de509ede836e8d27481ef68c987e5faa - + https://github.com/dotnet/sdk - 534d4b7df328c572e8e9075d89889581b5111122 + 76296007de509ede836e8d27481ef68c987e5faa - + https://github.com/dotnet/sdk - 534d4b7df328c572e8e9075d89889581b5111122 + 76296007de509ede836e8d27481ef68c987e5faa - + https://github.com/dotnet/winforms - 83f3a8476d682f8b74c7dce5505cc39560298447 + a4be2a433854d32adcbbe394204cfa8cdd493d50 - + https://github.com/dotnet/wpf - f76bd1c3f822ff6a4846d606afd9a2224e4f5902 + 2f640a5c73c5867c4a94209efbb4f7ebdc876471 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3705131e2..807bdcb09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23128.8 + 8.0.0-preview.3.23151.4 - 8.0.0-preview.3.23151.1 + 8.0.0-preview.3.23151.2 @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23152.8 - 8.0.100-preview.3.23152.8 - 8.0.100-preview.3.23152.8 + 8.0.100-preview.3.23152.9 + 8.0.100-preview.3.23152.9 + 8.0.100-preview.3.23152.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.3.23151.3 - 8.0.0-preview.3.23151.3 - 8.0.0-preview.3.23151.3 - 8.0.0-preview.3.23151.3 + 8.0.0-preview.3.23152.2 + 8.0.0-preview.3.23152.2 + 8.0.0-preview.3.23152.2 + 8.0.0-preview.3.23152.2 From 55430a2b54bc0d9cdd35eea149a55ecdb56b904b Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 10:59:00 +0100 Subject: [PATCH 422/864] filter tests --- .../templates/jobs/sdk-comparison-tests.yml | 4 +-- .../SkippableFactAttribute.cs | 27 ++++--------------- .../SkippableTheoryAttribute.cs | 12 +++------ 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index 462bf3bb6..af1ddad1e 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -102,9 +102,9 @@ jobs: envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msftSdkTarballName" envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdkTarballName" envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " - envArgs+=" -e SMOKE_TESTS_EXCLUDE_OMNISHARP=true -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} -e SMOKE_TESTS_PORTABLE_RID=linux-x64 -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= -e SMOKE_TESTS_INCLUDE=CompareMsftToSb" + envArgs+=" -e SMOKE_TESTS_EXCLUDE_OMNISHARP=true -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} -e SMOKE_TESTS_PORTABLE_RID=linux-x64 -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= " - .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed' + .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed' displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs index 9c9099ef4..867bb77a5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using System.Linq; -using System.Runtime.CompilerServices; using Xunit; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -14,29 +12,14 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// internal class SkippableFactAttribute : FactAttribute { - public SkippableFactAttribute([CallerMemberName] string name = "") => - CheckIncluded(name, (skip) => Skip = skip); + public SkippableFactAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envName); - public SkippableFactAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => - CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envName); + public SkippableFactAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envNames); - public SkippableFactAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => - CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envNames); - - public static void CheckIncluded(string methodName, Action setSkip) + public static void CheckEnvs(bool skipOnNullOrWhiteSpace, bool skipOnTrue, Action setSkip, params string[] envNames) { - var included = Config.IncludedTests; - if (included.Length != 0 && !included.Contains(methodName)) - { - setSkip($"Skipping because `{methodName}` is not included"); - return; - } - } - - public static void CheckEnvs(bool skipOnNullOrWhiteSpace, bool skipOnTrue, Action setSkip, string testName, params string[] envNames) - { - CheckIncluded(testName, setSkip); - foreach (string envName in envNames) { string? envValue = Environment.GetEnvironmentVariable(envName); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs index 6643204fa..32a7179a1 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Runtime.CompilerServices; using Xunit; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -12,12 +11,9 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; /// internal class SkippableTheoryAttribute : TheoryAttribute { - public SkippableTheoryAttribute([CallerMemberName] string testName = "") => - SkippableFactAttribute.CheckIncluded(testName, (skip) => Skip = skip); + public SkippableTheoryAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envName); - public SkippableTheoryAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => - SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envName); - - public SkippableTheoryAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false, [CallerMemberName] string testName = "") => - SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, testName, envNames); + public SkippableTheoryAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envNames); } From ebb7114365b6c7d6c867d8155d60938c96062c56 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 11:15:16 +0100 Subject: [PATCH 423/864] rm attributes --- .../BasicScenarioTests.cs | 2 +- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs | 2 +- .../SourceBuiltArtifactsTests.cs | 2 +- .../Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index 1cba40b26..b28eb3c7f 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -19,7 +19,7 @@ public class BasicScenarioTests : SmokeTests { public BasicScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [SkippableTheory()] + [Theory] [MemberData(nameof(GetScenarioObjects))] public void VerifyBasicScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index c5ba1572a..57b4e40b5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,7 +13,7 @@ public class DotNetWatchTests : SmokeTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [SkippableFact()] + [Fact] public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index 2e0906335..9d2833ada 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -13,7 +13,7 @@ public class SourceBuiltArtifactsTests : SmokeTests { public SourceBuiltArtifactsTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [SkippableFact()] + [Fact] public void VerifyVersionFile() { string outputDir = Path.Combine(Directory.GetCurrentDirectory(), "sourcebuilt-artifacts"); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 1d562540b..da1724add 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -18,7 +18,7 @@ public class WebScenarioTests : SmokeTests { public WebScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - [SkippableTheory()] + [Theory] [MemberData(nameof(GetScenarioObjects))] public void VerifyWebScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); From ebdc908f6b71c932d3929d77a9ef6324ff97003d Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Fri, 3 Mar 2023 11:42:45 +0100 Subject: [PATCH 424/864] Update eng/pipelines/templates/jobs/sdk-comparison-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-comparison-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index 462bf3bb6..b5dbe1ba5 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -18,7 +18,7 @@ jobs: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals 1es-ubuntu-2004 variables: - - template: /eng/common/templates/variables/pipelines.yml + - template: ../variables/pipelines.yml steps: - script: | vmr_build=${{ replace(parameters.dotnetDotnetRunID, ' ', '') }} From 7311d4965ffc06bb5c65b6e85e74acfb0479b79c Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 11:46:36 +0100 Subject: [PATCH 425/864] rename --- ...ntent-tests.yml => source-build-sdk-diff-tests.yml} | 10 +++++----- .../{sdk-comparison-tests.yml => sdk-diff-tests.yml} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename eng/pipelines/{source-build-sdk-content-tests.yml => source-build-sdk-diff-tests.yml} (78%) rename eng/pipelines/templates/jobs/{sdk-comparison-tests.yml => sdk-diff-tests.yml} (100%) diff --git a/eng/pipelines/source-build-sdk-content-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml similarity index 78% rename from eng/pipelines/source-build-sdk-content-tests.yml rename to eng/pipelines/source-build-sdk-diff-tests.yml index 734d711f2..1ff688f39 100644 --- a/eng/pipelines/source-build-sdk-content-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -20,35 +20,35 @@ parameters: default: ' ' jobs: -- template: templates/jobs/sdk-comparison-tests.yml +- template: templates/jobs/sdk-diff-tests.yml parameters: buildName: CentOSStream8_Offline targetRid: centos.8-x64 architecture: x64 dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} -- template: templates/jobs/sdk-comparison-tests.yml +- template: templates/jobs/sdk-diff-tests.yml parameters: buildName: CentOSStream9_Offline targetRid: centos.9-x64 architecture: x64 dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} -- template: templates/jobs/sdk-comparison-tests.yml +- template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Fedora36_Offline targetRid: fedora.36-x64 architecture: x64 dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} -- template: templates/jobs/sdk-comparison-tests.yml +- template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Ubuntu2004_Offline targetRid: ubuntu.2004-x64 architecture: x64 dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} -- template: templates/jobs/sdk-comparison-tests.yml +- template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Debian11_Offline targetRid: debian.11-arm64 diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml similarity index 100% rename from eng/pipelines/templates/jobs/sdk-comparison-tests.yml rename to eng/pipelines/templates/jobs/sdk-diff-tests.yml From 2af74c66c980f2c2490e999ed6c19a84819bf428 Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Fri, 3 Mar 2023 11:46:46 +0100 Subject: [PATCH 426/864] Update eng/pipelines/templates/jobs/sdk-comparison-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-comparison-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index b5dbe1ba5..df21a6423 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -21,7 +21,8 @@ jobs: - template: ../variables/pipelines.yml steps: - script: | - vmr_build=${{ replace(parameters.dotnetDotnetRunID, ' ', '') }} + vmr_build='${{ replace(parameters.dotnetDotnetRunID, ' ', '') }}' + if [[ -z "$vmr_build" ]]; then vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) From ad0eb25e52db04bf43d45ff5cbb72318e81e45ba Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Fri, 3 Mar 2023 11:47:05 +0100 Subject: [PATCH 427/864] Update eng/pipelines/templates/jobs/sdk-comparison-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-comparison-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml index df21a6423..87c8c1cc9 100644 --- a/eng/pipelines/templates/jobs/sdk-comparison-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-comparison-tests.yml @@ -46,7 +46,8 @@ jobs: echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build" - displayName: Get Build IDs + displayName: Find associated builds + name: Get_Build_Ids env: AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) From 522c032c922ddbc69ad9e03ff3fb9b69892fd960 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 12:06:01 +0100 Subject: [PATCH 428/864] rename --- eng/pipelines/source-build-sdk-diff-tests.yml | 12 +++++------ .../templates/jobs/sdk-diff-tests.yml | 20 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index 1ff688f39..8e492a646 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -14,7 +14,7 @@ pool: demands: ImageOverride -equals 1es-ubuntu-2004 parameters: -- name: dotnetDotnetRunID +- name: dotnetDotnetBuild displayName: 'Specific dotnet-dotnet run ID' type: string default: ' ' @@ -25,32 +25,32 @@ jobs: buildName: CentOSStream8_Offline targetRid: centos.8-x64 architecture: x64 - dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} + dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: CentOSStream9_Offline targetRid: centos.9-x64 architecture: x64 - dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} + dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Fedora36_Offline targetRid: fedora.36-x64 architecture: x64 - dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} + dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Ubuntu2004_Offline targetRid: ubuntu.2004-x64 architecture: x64 - dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} + dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Debian11_Offline targetRid: debian.11-arm64 architecture: arm64 - dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }} + dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 43b682829..313e47946 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -8,7 +8,7 @@ parameters: - name: architecture type: string -- name: dotnetDotnetRunID +- name: dotnetDotnetBuild type: string jobs: @@ -21,8 +21,7 @@ jobs: - template: ../variables/pipelines.yml steps: - script: | - vmr_build='${{ replace(parameters.dotnetDotnetRunID, ' ', '') }}' - + vmr_build='${{ replace(parameters.dotnetDotnetBuild, ' ', '') }}' if [[ -z "$vmr_build" ]]; then vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) @@ -47,7 +46,6 @@ jobs: echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build" displayName: Find associated builds - name: Get_Build_Ids env: AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) @@ -85,16 +83,16 @@ jobs: - script: | set -x - msftSdkTarballName=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) - if [[ -z $msftSdkTarballName ]]; then + if [[ -z $msft_sdk_tarball_name ]]; then fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" exit 1 fi - sdkTarballName=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) + sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) - if [[ -z $sdkTarballName ]]; then + if [[ -z $sdk_tarball_name ]]; then fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" exit 1 fi @@ -104,7 +102,11 @@ jobs: envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msftSdkTarballName" envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdkTarballName" envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " - envArgs+=" -e SMOKE_TESTS_EXCLUDE_OMNISHARP=true -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} -e SMOKE_TESTS_PORTABLE_RID=linux-x64 -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= " + envArgs+=" -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + envArgs+=" -e SMOKE_TESTS_RUNNING_IN_CI=true" + envArgs+=" -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }}" + envArgs+=" -e SMOKE_TESTS_PORTABLE_RID=linux-x64" + envArgs+=" -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= " .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed' displayName: Run Tests From 65f50bbad270a4903200b360b5de8cf57b93610a Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 12:17:00 +0100 Subject: [PATCH 429/864] rename --- eng/pipelines/source-build-sdk-diff-tests.yml | 12 ++++++------ eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index 8e492a646..dd30cab1e 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -14,7 +14,7 @@ pool: demands: ImageOverride -equals 1es-ubuntu-2004 parameters: -- name: dotnetDotnetBuild +- name: dotnetDotnetRunId displayName: 'Specific dotnet-dotnet run ID' type: string default: ' ' @@ -25,32 +25,32 @@ jobs: buildName: CentOSStream8_Offline targetRid: centos.8-x64 architecture: x64 - dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: CentOSStream9_Offline targetRid: centos.9-x64 architecture: x64 - dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Fedora36_Offline targetRid: fedora.36-x64 architecture: x64 - dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Ubuntu2004_Offline targetRid: ubuntu.2004-x64 architecture: x64 - dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Debian11_Offline targetRid: debian.11-arm64 architecture: arm64 - dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }} + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 313e47946..57cd3e5cb 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -8,7 +8,7 @@ parameters: - name: architecture type: string -- name: dotnetDotnetBuild +- name: dotnetDotnetRunId type: string jobs: @@ -21,7 +21,7 @@ jobs: - template: ../variables/pipelines.yml steps: - script: | - vmr_build='${{ replace(parameters.dotnetDotnetBuild, ' ', '') }}' + vmr_build='${{ replace(parameters.dotnetDotnetRunId, ' ', '') }}' if [[ -z "$vmr_build" ]]; then vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) From 1b3f81b17a1ebeb753d2b69dc4f6d8e73319afc6 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 12:19:33 +0100 Subject: [PATCH 430/864] print build url --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 57cd3e5cb..4809ee96a 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -32,7 +32,7 @@ jobs: exit 1 fi - echo "Vmr build id: '$vmr_build'" + echo "Vmr build: https://dev.azure.com/dnceng/internal/_build/results?buildId='$vmr_build'&view=results" installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $vmr_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) @@ -41,7 +41,7 @@ jobs: exit 1 fi - echo "Installer build id: '$installer_build'" + echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId='$installer_build'&view=results" echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build" From 3ce4268b08144c3572860b807d6632542a2e89f7 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 12:36:26 +0100 Subject: [PATCH 431/864] move variable templates --- eng/{common => pipelines}/templates/variables/pipelines.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename eng/{common => pipelines}/templates/variables/pipelines.yml (100%) diff --git a/eng/common/templates/variables/pipelines.yml b/eng/pipelines/templates/variables/pipelines.yml similarity index 100% rename from eng/common/templates/variables/pipelines.yml rename to eng/pipelines/templates/variables/pipelines.yml From 598dd6328f288327c47b48f88ee1502be0a73ef3 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 12:43:10 +0100 Subject: [PATCH 432/864] fix --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 4809ee96a..8b566221b 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -99,8 +99,8 @@ jobs: eng/common/build.sh --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore - envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msftSdkTarballName" - envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdkTarballName" + envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" + envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name" envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " envArgs+=" -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" envArgs+=" -e SMOKE_TESTS_RUNNING_IN_CI=true" From 27786749dba405dcd9467bc03bd1720758bcd84e Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 13:12:25 +0100 Subject: [PATCH 433/864] fix url --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 8b566221b..53a528b78 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -32,7 +32,7 @@ jobs: exit 1 fi - echo "Vmr build: https://dev.azure.com/dnceng/internal/_build/results?buildId='$vmr_build'&view=results" + echo "Vmr build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$vmr_build&view=results" installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $vmr_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) @@ -41,7 +41,7 @@ jobs: exit 1 fi - echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId='$installer_build'&view=results" + echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results" echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build" From d0d28f2618e9d54896992dafaf42b567c8e6079c Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 13:21:52 +0100 Subject: [PATCH 434/864] rename --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 53a528b78..83ed5873e 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -21,20 +21,20 @@ jobs: - template: ../variables/pipelines.yml steps: - script: | - vmr_build='${{ replace(parameters.dotnetDotnetRunId, ' ', '') }}' + dotnet_dotnet_build='${{ replace(parameters.dotnetDotnetRunId, ' ', '') }}' - if [[ -z "$vmr_build" ]]; then - vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) + if [[ -z "$dotnet_dotnet_build" ]]; then + dotnet_dotnet_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) fi - if [[ -z "$vmr_build" ]]; then + if [[ -z "$dotnet_dotnet_build" ]]; then fail "Could not find a completed vmr build" exit 1 fi - echo "Vmr build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$vmr_build&view=results" + echo "Vmr build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $vmr_build --output tsv | sed "s,installer-,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then fail "Could not find a build of installer for commit '$installer_sha'" @@ -44,7 +44,7 @@ jobs: echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results" echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" - echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build" + echo "##vso[task.setvariable variable=VmrBuildId]$dotnet_dotnet_build" displayName: Find associated builds name: Get_Build_Ids env: @@ -108,7 +108,7 @@ jobs: envArgs+=" -e SMOKE_TESTS_PORTABLE_RID=linux-x64" envArgs+=" -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= " - .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed' + .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'console;verbosity=detailed' displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) From 29f9752d2b5f1e6f9f5b4fe14ba8a1943f3a8f3b Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 13:57:25 +0100 Subject: [PATCH 435/864] schedule --- eng/pipelines/source-build-sdk-diff-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index dd30cab1e..33fbb78a5 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,5 +1,5 @@ schedules: -- cron: "0 0 * * *" +- cron: "0 7 * * 1-5" displayName: Daily midnight run branches: include: From ee222d3f236116ddce351c6e318d5cb76a8f5054 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 14:00:15 +0100 Subject: [PATCH 436/864] revert changes in tests --- .../BasicScenarioTests.cs | 2 +- .../Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs | 10 ---------- .../OmniSharpTests.cs | 2 +- .../WebScenarioTests.cs | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index b28eb3c7f..af435cfdc 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -21,7 +21,7 @@ public class BasicScenarioTests : SmokeTests [Theory] [MemberData(nameof(GetScenarioObjects))] - public void VerifyBasicScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); + public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index 64ca31e93..ec2d40ca5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -11,7 +11,6 @@ internal static class Config { public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR"; public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP"; - public const string IncludeTestsEnv = "SMOKE_TESTS_INCLUDE"; public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH"; public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID"; @@ -46,13 +45,4 @@ internal static class Config // Indicates whether the tests are being run in the context of a CI pipeline public static bool RunningInCI { get; } = bool.TryParse(Environment.GetEnvironmentVariable(RunningInCIEnv), out bool runningInCI) && runningInCI; - - public static string[] IncludedTests - { - get - { - var include = Environment.GetEnvironmentVariable(IncludeTestsEnv); - return include == null ? Array.Empty() : include.Split(','); - } - } } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 036a6b800..56f14043b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -34,7 +34,7 @@ public class OmniSharpTests : SmokeTests [InlineData(DotNetTemplate.WebApi)] [InlineData(DotNetTemplate.Worker)] [InlineData(DotNetTemplate.XUnit)] - public async void VerifyOmniSharpScenario(DotNetTemplate template) + public async void VerifyScenario(DotNetTemplate template) { await InitializeOmniSharp(); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index da1724add..56d0368f3 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -20,7 +20,7 @@ public class WebScenarioTests : SmokeTests [Theory] [MemberData(nameof(GetScenarioObjects))] - public void VerifyWebScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); + public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); From a4f5ecb0eb00c0033ac9a27811bd9dc6f3dc8f11 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 14:28:30 +0100 Subject: [PATCH 437/864] fail message --- eng/pipelines/source-build-sdk-diff-tests.yml | 4 ++-- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index 33fbb78a5..efa6991a1 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,6 +1,6 @@ schedules: - cron: "0 7 * * 1-5" - displayName: Daily midnight run + displayName: Run on weekdays at 7am UTC branches: include: - main @@ -15,7 +15,7 @@ pool: parameters: - name: dotnetDotnetRunId - displayName: 'Specific dotnet-dotnet run ID' + displayName: 'Specific dotnet-dotnet run ID number (e.g `2108850`)' type: string default: ' ' diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 83ed5873e..6aea584f8 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -44,7 +44,7 @@ jobs: echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results" echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" - echo "##vso[task.setvariable variable=VmrBuildId]$dotnet_dotnet_build" + echo "##vso[task.setvariable variable=DotnetDotnetBuildId]$dotnet_dotnet_build" displayName: Find associated builds name: Get_Build_Ids env: @@ -72,7 +72,7 @@ jobs: buildVersionToDownload: specific project: internal pipeline: $(DOTNET_DOTNET_CI_PIPELINE_ID) - buildId: $(VmrBuildId) + buildId: $(DotnetDotnetBuildId) artifact: ${{ parameters.buildName }}_${{ parameters.architecture }}_Artifacts patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-${{ parameters.targetRid }}.tar.gz' allowPartiallySucceededBuilds: true @@ -86,14 +86,14 @@ jobs: msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z $msft_sdk_tarball_name ]]; then - fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" + fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results' might have failed." exit 1 fi sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) if [[ -z $sdk_tarball_name ]]; then - fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" + fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results' might have failed" exit 1 fi From ea1ea9e4233aee386f65b18c321efbd794f5ef97 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 14:48:20 +0100 Subject: [PATCH 438/864] fail tests --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 6aea584f8..2196f7bac 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -102,7 +102,7 @@ jobs: envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name" envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " - envArgs+=" -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + envArgs+=" -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=false" envArgs+=" -e SMOKE_TESTS_RUNNING_IN_CI=true" envArgs+=" -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }}" envArgs+=" -e SMOKE_TESTS_PORTABLE_RID=linux-x64" From 7b74786a8fe9762fe51805fc4ae18d2f5874782d Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Fri, 3 Mar 2023 15:21:01 +0100 Subject: [PATCH 439/864] remove msft sdk build from vmr-build --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- eng/pipelines/templates/stages/vmr-build.yml | 7 -- src/SourceBuild/content/eng/pipelines/ci.yml | 79 ++++++-------------- 3 files changed, 25 insertions(+), 63 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 625e55eda..befedfa82 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -34,7 +34,7 @@ parameters: # Skip running the SDK content smoke-tests - name: excludeSdkContentTests type: boolean - default: false + default: true # Name of a previous job (from the same template as this) whose output will be used to build this job # The SDK from its artifacts is copied to vmr/.dotnet diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 515ab8dac..a779cf51a 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -78,7 +78,6 @@ stages: buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ - excludeSdkContentTests: true # ✅ overrideDistroDisablingSha1: false # 🚫 runOnline: true # ✅ @@ -96,7 +95,6 @@ stages: buildFromArchive: true # ✅ enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ - excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 @@ -113,7 +111,6 @@ stages: buildFromArchive: true # ✅ enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 - excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: true # ✅ runOnline: false # 🚫 @@ -130,7 +127,6 @@ stages: buildFromArchive: true # ✅ enablePoison: true # ✅ excludeOmniSharpTests: false # 🚫 - excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 @@ -147,7 +143,6 @@ stages: buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 - excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 @@ -162,7 +157,6 @@ stages: buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 - excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 @@ -179,7 +173,6 @@ stages: buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 - excludeSdkContentTests: true # ✅ overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 reuseBuildArtifactsFrom: Fedora36_Offline diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index ed3dad1a0..55b6a212d 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -1,55 +1,24 @@ -# This is the main build definition (PR+CI) for dotnet/dotnet - -trigger: - batch: true - branches: - include: - - main - - release/* - - internal/release/* - -pr: - branches: - include: - - main - - release/* - - internal/release/* - -stages: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: templates/stages/vmr-scan.yml - - # For rolling builds we want to build the MSFT SDK first so that we can - # compare the contents with the source-built one later. - # This only works because we don't run this test in PRs. If we decided - # to run this test in PRs, we would need to build the MSFT SDK there too. - - stage: Build_MSFT_SDK - displayName: Build MSFT SDK - dependsOn: [] - jobs: - - template: /src/installer/eng/build.yml - parameters: - agentOs: Linux - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false - isBuiltFromVmr: true - - template: /src/installer/eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm64_Release - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - linuxPortable: true - runTests: false - isBuiltFromVmr: true - -- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml - parameters: - isBuiltFromVmr: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - dependsOn: Build_MSFT_SDK - condition: always() +# This is the main build definition (PR+CI) for dotnet/dotnet + +trigger: + batch: true + branches: + include: + - main + - release/* + - internal/release/* + +pr: + branches: + include: + - main + - release/* + - internal/release/* + +stages: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: templates/stages/vmr-scan.yml + +- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml + parameters: + isBuiltFromVmr: true From a4ecf7bfc012e282bb2f1c81081328098dcb9b35 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 3 Mar 2023 08:55:03 -0600 Subject: [PATCH 440/864] Update poison usage baseline. (#15688) --- .../assets/baselines/PoisonUsage.txt | 281 +++++++----------- 1 file changed, 109 insertions(+), 172 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 2866b7f1e..9428e5b29 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1,178 +1,34 @@ - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - + AssemblyAttribute AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute - - AssemblyAttribute - AssemblyAttribute @@ -182,6 +38,9 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute @@ -236,6 +95,9 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute @@ -248,7 +110,7 @@ AssemblyAttribute - + AssemblyAttribute @@ -263,6 +125,9 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute @@ -272,6 +137,18 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -287,6 +164,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -296,6 +179,9 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute @@ -407,6 +293,9 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute @@ -422,10 +311,10 @@ AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute @@ -437,6 +326,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -446,6 +341,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -488,7 +389,7 @@ AssemblyAttribute - + AssemblyAttribute @@ -581,10 +482,19 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute - + + AssemblyAttribute + + + AssemblyAttribute + + AssemblyAttribute @@ -593,6 +503,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -617,6 +533,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -833,7 +755,16 @@ AssemblyAttribute - + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + AssemblyAttribute @@ -842,6 +773,9 @@ AssemblyAttribute + + AssemblyAttribute + AssemblyAttribute @@ -941,12 +875,24 @@ AssemblyAttribute - + + AssemblyAttribute + + + AssemblyAttribute + + AssemblyAttribute AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -998,7 +944,7 @@ AssemblyAttribute - + AssemblyAttribute @@ -1055,7 +1001,7 @@ AssemblyAttribute - + AssemblyAttribute @@ -1124,7 +1070,7 @@ AssemblyAttribute - + AssemblyAttribute @@ -1133,9 +1079,6 @@ AssemblyAttribute - - AssemblyAttribute - AssemblyAttribute @@ -1145,9 +1088,6 @@ AssemblyAttribute - - AssemblyAttribute - AssemblyAttribute @@ -1157,9 +1097,6 @@ AssemblyAttribute - - AssemblyAttribute - AssemblyAttribute @@ -1175,10 +1112,10 @@ AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute \ No newline at end of file From 9bd65f4d782334006f22bfaafd1b42a03ece4875 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 3 Mar 2023 09:47:25 -0600 Subject: [PATCH 441/864] Fix tarball extraction when using wildcards (#15695) --- .../SourceBuiltArtifactsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index 9d2833ada..1650f3ef8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -63,6 +63,6 @@ public class SourceBuiltArtifactsTests : SmokeTests private void ExtractFileFromTarball(string tarballPath, string filePath, string outputDir) { - ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {tarballPath} -C {outputDir} {filePath}", OutputHelper); + ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"--wildcards -xzf {tarballPath} -C {outputDir} {filePath}", OutputHelper); } } From c04953cc0b6b928e4b78db9f866b5bf82606d39f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 16:21:44 +0000 Subject: [PATCH 442/864] Update dependencies from https://github.com/dotnet/sdk build 20230303.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23153.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23151.3 -> To Version 8.0.0-preview.3.23152.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 535e2393c..3f47a748e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 3d0d6c89067692549e98e04b8cd924824920a170 + cb7e5ff415890c504daec498d9e0df3c0e71298c - + https://github.com/dotnet/windowsdesktop - 3d0d6c89067692549e98e04b8cd924824920a170 + cb7e5ff415890c504daec498d9e0df3c0e71298c - + https://github.com/dotnet/windowsdesktop - 3d0d6c89067692549e98e04b8cd924824920a170 + cb7e5ff415890c504daec498d9e0df3c0e71298c - + https://github.com/dotnet/windowsdesktop - 3d0d6c89067692549e98e04b8cd924824920a170 + cb7e5ff415890c504daec498d9e0df3c0e71298c https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 76296007de509ede836e8d27481ef68c987e5faa + 45d0a4a0457f2091765ea39a851e69f307c09463 - + https://github.com/dotnet/sdk - 76296007de509ede836e8d27481ef68c987e5faa + 45d0a4a0457f2091765ea39a851e69f307c09463 - + https://github.com/dotnet/sdk - 76296007de509ede836e8d27481ef68c987e5faa + 45d0a4a0457f2091765ea39a851e69f307c09463 - + https://github.com/dotnet/sdk - 76296007de509ede836e8d27481ef68c987e5faa + 45d0a4a0457f2091765ea39a851e69f307c09463 https://github.com/dotnet/winforms a4be2a433854d32adcbbe394204cfa8cdd493d50 - + https://github.com/dotnet/wpf - 2f640a5c73c5867c4a94209efbb4f7ebdc876471 + 26762c368454ab098ba60a0e979d53ff6af9b7ac https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 807bdcb09..fe15f9301 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 8.0.0-preview.3.23151.2 + 8.0.0-preview.3.23152.1 @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23152.9 - 8.0.100-preview.3.23152.9 - 8.0.100-preview.3.23152.9 + 8.0.100-preview.3.23153.1 + 8.0.100-preview.3.23153.1 + 8.0.100-preview.3.23153.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-preview.3.23152.2 - 8.0.0-preview.3.23152.2 - 8.0.0-preview.3.23152.2 - 8.0.0-preview.3.23152.2 + 8.0.0-preview.3.23152.3 + 8.0.0-preview.3.23152.3 + 8.0.0-preview.3.23152.3 + 8.0.0-preview.3.23152.3 From f4c0205b68e69f56f5bc0c9e09f3226f1b91800a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 18:42:58 +0000 Subject: [PATCH 443/864] Update dependencies from https://github.com/dotnet/sdk build 20230303.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23153.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23151.3 -> To Version 8.0.0-preview.3.23152.3 (parent: Microsoft.NET.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 3f47a748e..3198eb4c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 45d0a4a0457f2091765ea39a851e69f307c09463 + 2b0931a3cbbcac3c27469f8fe83718d2082cb012 - + https://github.com/dotnet/sdk - 45d0a4a0457f2091765ea39a851e69f307c09463 + 2b0931a3cbbcac3c27469f8fe83718d2082cb012 - + https://github.com/dotnet/sdk - 45d0a4a0457f2091765ea39a851e69f307c09463 + 2b0931a3cbbcac3c27469f8fe83718d2082cb012 - + https://github.com/dotnet/sdk - 45d0a4a0457f2091765ea39a851e69f307c09463 + 2b0931a3cbbcac3c27469f8fe83718d2082cb012 diff --git a/eng/Versions.props b/eng/Versions.props index fe15f9301..9f71093e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23153.1 - 8.0.100-preview.3.23153.1 - 8.0.100-preview.3.23153.1 + 8.0.100-preview.3.23153.3 + 8.0.100-preview.3.23153.3 + 8.0.100-preview.3.23153.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bbcda00995b819a9478a823c9e7c20e199607ae2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 19:41:31 +0000 Subject: [PATCH 444/864] [main] Update dependencies from dotnet/arcade (#15694) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23128-02 to 1.2.0-beta-23151-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23128.1 to 1.0.0-beta.23151.1 (parent: Microsoft.DotNet.Arcade.Sdk) - Merge branch 'main' into darc-main-eea5aea1-2b02-4021-8e75-57af40e4e8f8 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3531ad6f..f2b71a5d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 - + https://github.com/dotnet/arcade - bdc59254cf108e1d48451dc43bb9ebc331cdca7b + 6b3afa7543dd5d69e621015cd1569fb0960b5f24 https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ 72584554974ece2019fbd3dd6743a282f39d9b87 - + https://github.com/dotnet/sourcelink - 1d0b20231ab9387f2b6d1c645cac30f763fdf419 + 5585cd4cd5779bc7efdf3e2f19ed0bef50b15f7b - + https://github.com/dotnet/xliff-tasks - dd049b903ad1a4d53208f3767d181c28058eaa3e + 95794aa6747aa08b79869e7dac06a9ac5d922ab2 diff --git a/eng/Versions.props b/eng/Versions.props index eb39d3de3..02a1864ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23151.4 + 8.0.0-beta.23152.1 diff --git a/global.json b/global.json index 405b72a6b..3ed397fe7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23151.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23152.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23152.1" } } From a010d193ef817af534fd33b07b6b7170d7c24f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 20:20:07 +0000 Subject: [PATCH 445/864] Update dependencies from https://github.com/dotnet/sdk build 20230303.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23153.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23151.3 -> To Version 8.0.0-preview.3.23152.3 (parent: Microsoft.NET.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 3198eb4c2..bfea93675 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2b0931a3cbbcac3c27469f8fe83718d2082cb012 + 9fe2b6ade125529490c331d200253dc51eedb2b0 - + https://github.com/dotnet/sdk - 2b0931a3cbbcac3c27469f8fe83718d2082cb012 + 9fe2b6ade125529490c331d200253dc51eedb2b0 - + https://github.com/dotnet/sdk - 2b0931a3cbbcac3c27469f8fe83718d2082cb012 + 9fe2b6ade125529490c331d200253dc51eedb2b0 - + https://github.com/dotnet/sdk - 2b0931a3cbbcac3c27469f8fe83718d2082cb012 + 9fe2b6ade125529490c331d200253dc51eedb2b0 diff --git a/eng/Versions.props b/eng/Versions.props index 9f71093e0..b9e848389 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23153.3 - 8.0.100-preview.3.23153.3 - 8.0.100-preview.3.23153.3 + 8.0.100-preview.3.23153.5 + 8.0.100-preview.3.23153.5 + 8.0.100-preview.3.23153.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32284ea4fb55eeee8cf402582a069b736e13c58f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Mar 2023 20:40:39 +0000 Subject: [PATCH 446/864] Update dependencies from https://github.com/dotnet/sdk build 20230303.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23152.5 -> To Version 7.0.300-preview.23153.4 --- 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 9f9d5e0ce..58ac14583 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 - + https://github.com/dotnet/sdk - a97e6a95d9707bfdc600d95a046f03e369c172a2 + 4840cf0aef98894a07844b704240ab6185d25415 diff --git a/eng/Versions.props b/eng/Versions.props index 8af130605..0c463cbc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23152.5 - 7.0.300-preview.23152.5 - 7.0.300-preview.23152.5 + 7.0.300-preview.23153.4 + 7.0.300-preview.23153.4 + 7.0.300-preview.23153.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f2ae53fbe18979d5604f02b3b72748a1fe21cb2b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 Mar 2023 16:56:16 -0600 Subject: [PATCH 447/864] Remove obsolete roslyn patch (#15700) --- ...01-Patch-to-prevent-WPF-from-loading.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch diff --git a/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch b/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch deleted file mode 100644 index 29e3a2545..000000000 --- a/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 1 Mar 2023 00:59:46 +0000 -Subject: [PATCH] Patch to prevent WPF from loading - -Backport: https://github.com/dotnet/source-build/issues/3280 ---- - src/Tools/IdeBenchmarks/IdeBenchmarks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -index cf0e1886b83..2ee6d355401 100644 ---- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -+++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -@@ -7,7 +7,7 @@ - net472 - false - $(NoWarn),CA2007 -- true -+ true - - - From 9fd347ecc6f6fc48a5f43831f930a98ec969987d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 4 Mar 2023 01:02:21 +0000 Subject: [PATCH 448/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15663) [main] Update dependencies from dotnet/source-build-reference-packages - Merge branch 'main' into darc-main-a5871600-afe9-48ca-9b69-5d1a9905783b --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2b71a5d2..48aa014ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 72584554974ece2019fbd3dd6743a282f39d9b87 + 8937ac7a3a2ea6efdf3b908a9d5cc14d37f911cf From 9cf0095d0892d385a7e26772752d75e3bb68d8e4 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 3 Mar 2023 17:53:19 -0800 Subject: [PATCH 449/864] [main] Add CI for building with previously source-built SDK (#15603) Co-authored-by: Michael Simons --- eng/pipelines/templates/jobs/vmr-build.yml | 43 ++++++++++++++++---- eng/pipelines/templates/stages/vmr-build.yml | 41 +++++++++++++++---- src/SourceBuild/content/eng/Versions.props | 17 +++----- src/SourceBuild/content/prep.sh | 18 +++++--- 4 files changed, 87 insertions(+), 32 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 625e55eda..3f575ff29 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -58,6 +58,10 @@ parameters: type: boolean default: false +- name: withPreviousSDK + type: boolean + default: false + jobs: - job: ${{ parameters.buildName }}_${{ parameters.architecture }} timeoutInMinutes: 150 @@ -76,12 +80,8 @@ jobs: - ${{ else }}: - name: BotAccount-dotnet-bot-repo-PAT value: N/A - - ${{ if eq(parameters.reuseBuildArtifactsFrom, '') }}: - - name: additionalBuildArgs - value: '' - - ${{ else }}: - - name: additionalBuildArgs - value: ' --with-sdk /vmr/.dotnet' + - name: additionalBuildArgs + value: '' # Location of the VMR sources # We either build the repo directly, or we extract them outside (which is what partners do) @@ -147,16 +147,45 @@ jobs: Contents: '*.tar.gz' TargetFolder: ${{ variables.sourcesPath }}/prereqs/packages/archive/ + - ${{ if eq(parameters.withPreviousSDK, 'true') }}: + - script: | + set -euo pipefail + + packageVersionsPath="${{ variables.sourcesPath }}/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveUrlLine=`grep -m 1 "" "$packageVersionsPath" || :` + urlPattern="(.*)" + + if [[ $archiveUrlLine =~ $urlPattern ]]; then + archiveUrl="${BASH_REMATCH[1]}" + downloadDir="$(sourcesPath)/prereqs/packages/archive/" + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + else + echo "$notFoundMessage" + exit 1 + fi + displayName: Setup Previously Source-Built SDK + - script: | set -x - if [[ -z '${{ parameters.reuseBuildArtifactsFrom }}' ]]; then + if [[ -z '${{ parameters.reuseBuildArtifactsFrom }}' && '${{ parameters.withPreviousSDK }}' != 'True' ]]; then docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh else mkdir $(sourcesPath)/.dotnet previousSdkPath="$(sourcesPath)/prereqs/packages/archive/dotnet-sdk-*.tar.gz" eval tar -ozxf "$previousSdkPath" -C "$(sourcesPath)/.dotnet" eval rm -f "$previousSdkPath" + + if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then + # Source-built artifacts are from CentOS 8 Stream. We want to download them without + # downloading portable versions from the internet. + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh --no-bootstrap + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet" fi displayName: Prep the Build diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 515ab8dac..e09fdbbe6 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -67,7 +67,7 @@ stages: jobs: - template: ../jobs/vmr-build.yml parameters: - buildName: CentOSStream8_Online + buildName: CentOSStream8_Online_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 @@ -81,11 +81,30 @@ stages: excludeSdkContentTests: true # ✅ overrideDistroDisablingSha1: false # 🚫 runOnline: true # ✅ + withPreviousSDK: false # 🚫 - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - template: ../jobs/vmr-build.yml parameters: - buildName: CentOSStream8_Offline + buildName: CentOSStream8_Online_PreviousSourceBuiltSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} + container: ${{ parameters.centOSStream8Container }} + buildFromArchive: false # 🚫 + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + excludeSdkContentTests: true # ✅ + overrideDistroDisablingSha1: false # 🚫 + runOnline: true # ✅ + withPreviousSDK: true # ✅ + + - template: ../jobs/vmr-build.yml + parameters: + buildName: CentOSStream8_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 @@ -99,10 +118,11 @@ stages: excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 + withPreviousSDK: false # 🚫 - template: ../jobs/vmr-build.yml parameters: - buildName: CentOSStream9_Offline + buildName: CentOSStream9_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 @@ -116,10 +136,11 @@ stages: excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: true # ✅ runOnline: false # 🚫 + withPreviousSDK: false # 🚫 - template: ../jobs/vmr-build.yml parameters: - buildName: Fedora36_Offline + buildName: Fedora36_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 @@ -133,10 +154,11 @@ stages: excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 + withPreviousSDK: false # 🚫 - template: ../jobs/vmr-build.yml parameters: - buildName: Ubuntu2004_Offline + buildName: Ubuntu2004_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 @@ -150,10 +172,11 @@ stages: excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 + withPreviousSDK: false # 🚫 - template: ../jobs/vmr-build.yml parameters: - buildName: Debian11_Offline + buildName: Debian11_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: arm64 @@ -165,10 +188,11 @@ stages: excludeSdkContentTests: false # 🚫 overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 + withPreviousSDK: false # 🚫 - template: ../jobs/vmr-build.yml parameters: - buildName: Fedora36_Offline_Using_Previous + buildName: Fedora36_Offline_CurrentSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 @@ -182,4 +206,5 @@ stages: excludeSdkContentTests: true # ✅ overrideDistroDisablingSha1: false # 🚫 runOnline: false # 🚫 - reuseBuildArtifactsFrom: Fedora36_Offline + withPreviousSDK: false # 🚫 + reuseBuildArtifactsFrom: Fedora36_Offline_MsftSdk diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index e466a9189..049760016 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -12,19 +12,14 @@ - 0.1.0-8.0.100-5.centos.8-x64 - 0.1.0-8.0.100-8.centos.8-x64 + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-8.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 8c03cadc0..ba5415671 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -9,10 +9,12 @@ usage() { echo "" echo " Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and" echo " installing the version of dotnet referenced in global.json" + echo "options:" + echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" echo "" } -buildBootstrap=false +buildBootstrap=true positional_args=() while :; do if [ $# -le 0 ]; then @@ -24,6 +26,9 @@ while :; do usage exit 0 ;; + --no-bootstrap) + buildBootstrap=false + ;; *) positional_args+=("$1") ;; @@ -69,15 +74,14 @@ function DownloadArchive { baseFileName="$2" isRequired="$3" - sourceBuiltArtifactsTarballUrl="https://dotnetcli.azureedge.net/source-built-artifacts/assets/" packageVersionsPath="$SCRIPT_ROOT/eng/Versions.props" notFoundMessage="No source-built $archiveType found to download..." echo " Looking for source-built $archiveType to download..." - archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` - versionPattern="(.*)" + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" if [[ $archiveVersionLine =~ $versionPattern ]]; then - archiveUrl="${sourceBuiltArtifactsTarballUrl}${baseFileName}.${BASH_REMATCH[1]}.tar.gz" + archiveUrl="${BASH_REMATCH[1]}" echo " Downloading source-built $archiveType from $archiveUrl..." (cd $packagesArchiveDir && curl --retry 5 -O $archiveUrl) elif [ "$isRequired" == "true" ]; then @@ -124,7 +128,9 @@ fi # Read the eng/Versions.props to get the archives to download and download them if [ "$downloadArtifacts" == "true" ]; then DownloadArchive "Artifacts" $artifactsBaseFileName "true" - BootstrapArtifacts + if [ "$buildBootstrap" == "true" ]; then + BootstrapArtifacts + fi fi if [ "$downloadPrebuilts" == "true" ]; then From 20c94ee0c67add3d259320370c35fac507d5d1ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Mar 2023 02:37:25 +0000 Subject: [PATCH 450/864] Update dependencies from https://github.com/dotnet/sdk build 20230303.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23152.4 -> To Version 8.0.100-preview.3.23153.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-preview.3.23151.3 -> To Version 8.0.0-preview.3.23152.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd84b23ac..b9cf91e35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 - + https://github.com/dotnet/aspnetcore - 5d10dceeaf5d1d4ac945356f580cce5cf0486c40 + 39f36e753bc81d0589182218c16921576003d394 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 9fe2b6ade125529490c331d200253dc51eedb2b0 + 8b335293f9a1360fa5364506c22bd74c339c8648 - + https://github.com/dotnet/sdk - 9fe2b6ade125529490c331d200253dc51eedb2b0 + 8b335293f9a1360fa5364506c22bd74c339c8648 - + https://github.com/dotnet/sdk - 9fe2b6ade125529490c331d200253dc51eedb2b0 + 8b335293f9a1360fa5364506c22bd74c339c8648 - + https://github.com/dotnet/sdk - 9fe2b6ade125529490c331d200253dc51eedb2b0 + 8b335293f9a1360fa5364506c22bd74c339c8648 diff --git a/eng/Versions.props b/eng/Versions.props index 53a1685c7..ecfa98fc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23152.10 - 8.0.0-preview.3.23152.10 - 8.0.0-preview.3.23152.10 - 8.0.0-preview.3.23152.10 - 8.0.0-preview.3.23152.10 - 8.0.0-preview.3.23152.10 - 8.0.0-preview.3.23152.10 + 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23153.7 0.2.0 - 8.0.100-preview.3.23153.5 - 8.0.100-preview.3.23153.5 - 8.0.100-preview.3.23153.5 + 8.0.100-preview.3.23153.7 + 8.0.100-preview.3.23153.7 + 8.0.100-preview.3.23153.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7da23ac667611a169730389b2af27393ac270de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Mar 2023 13:16:40 +0000 Subject: [PATCH 451/864] Update dependencies from https://github.com/dotnet/arcade build 20230303.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23152.1 -> To Version 8.0.0-beta.23153.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48aa014ee..49787ec3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af - + https://github.com/dotnet/arcade - 6b3afa7543dd5d69e621015cd1569fb0960b5f24 + 7f6d9796cc7f594772f798358dbdd8c69b6a97af https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 02a1864ef..0d129b6ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23152.1 + 8.0.0-beta.23153.1 diff --git a/global.json b/global.json index 3ed397fe7..a5a531b94 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23152.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23152.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23153.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23153.1" } } From 8aca98b75491ff13aee385bb89f89e158413d781 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 04:27:37 +0000 Subject: [PATCH 452/864] [main] Update dependencies from dotnet/source-build-externals (#15703) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49787ec3d..9444e5c66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,9 +183,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 8e1b361dfb41ed15955a3793d4da1f2cf8129fb0 + 487e3990066862c81960a6d053b9d04c67f9d2a8 From 5d06581db1d00a6d24ee2e3c1e4930ee4de37b37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 04:27:46 +0000 Subject: [PATCH 453/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15701) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9444e5c66..c2e8853f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8937ac7a3a2ea6efdf3b908a9d5cc14d37f911cf + a3ee2277e860df151d33d72e9b7fabf1e564b3d8 From b050f611f9e516b62e9e9974f5c89613150b5eb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Mar 2023 03:27:38 +0000 Subject: [PATCH 454/864] Update dependencies from https://github.com/dotnet/sdk build 20230305.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23153.4 -> To Version 7.0.300-preview.23155.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23127.2 -> To Version 12.5.0-beta.23153.7 (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 58ac14583..ffc64083e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd - + https://github.com/dotnet/sdk - 4840cf0aef98894a07844b704240ab6185d25415 + 832e7c34a78bdbfb87dcd36d90aa3ffdd95c24bd @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce + ab771de3c23cebcf699e1753500a8649eb4b6272 - + https://github.com/dotnet/fsharp - 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce + ab771de3c23cebcf699e1753500a8649eb4b6272 diff --git a/eng/Versions.props b/eng/Versions.props index 0c463cbc3..d0d130275 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23153.4 - 7.0.300-preview.23153.4 - 7.0.300-preview.23153.4 + 7.0.300-preview.23155.1 + 7.0.300-preview.23155.1 + 7.0.300-preview.23155.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69d82ce3422ec28af38eb0fbe4fbada9e490e47d Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 09:56:53 +0100 Subject: [PATCH 455/864] clean up vmr-build --- eng/pipelines/templates/jobs/vmr-build.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index befedfa82..f05f1e59f 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -31,11 +31,6 @@ parameters: - name: runOnline type: boolean -# Skip running the SDK content smoke-tests -- name: excludeSdkContentTests - type: boolean - default: true - # Name of a previous job (from the same template as this) whose output will be used to build this job # The SDK from its artifacts is copied to vmr/.dotnet - name: reuseBuildArtifactsFrom @@ -128,12 +123,6 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - - download: current - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' - displayName: Download MSFT SDK - - ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: - download: current artifact: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts @@ -192,12 +181,6 @@ jobs: dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests }} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true" poisonArg='' - if [[ '${{ parameters.excludeSdkContentTests }}' != 'True' ]]; then - dockerVolumeArgs+=" -v $(Pipeline.Workspace)/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(Pipeline.Workspace)/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) - dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" - fi - if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then poisonArg='--poison' dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" From 0cda957a5122b10e37bef27dc7a7f93ab1c62877 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 10:45:22 +0100 Subject: [PATCH 456/864] split dotnet test line --- .../templates/jobs/sdk-diff-tests.yml | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 2196f7bac..5072e87e7 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -86,29 +86,39 @@ jobs: msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z $msft_sdk_tarball_name ]]; then - fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results' might have failed." + fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" exit 1 fi sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) if [[ -z $sdk_tarball_name ]]; then - fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results' might have failed" + fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" exit 1 fi eng/common/build.sh --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore - envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" - envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name" - envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= " - envArgs+=" -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=false" - envArgs+=" -e SMOKE_TESTS_RUNNING_IN_CI=true" - envArgs+=" -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }}" - envArgs+=" -e SMOKE_TESTS_PORTABLE_RID=linux-x64" - envArgs+=" -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= " - - .dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'console;verbosity=detailed' + echo "##vso[task.setvariable variable=MsftSdkTarballName]$msft_sdk_tarball_name" + echo "##vso[task.setvariable variable=SdkTarballName]$sdk_tarball_name" + displayName: Prepare Tests + workingDirectory: $(Build.SourcesDirectory) + + - script: > + .dotnet/dotnet + test + $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj + --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" + --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' + --logger:'console;verbosity=detailed' + -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$(MsftSdkTarballName) + -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$(SdkTarballName) + -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= + -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=false + -e SMOKE_TESTS_RUNNING_IN_CI=true + -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} + -e SMOKE_TESTS_PORTABLE_RID=linux-x64 + -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) From 06de0ca3bc35a6c1459fd2e1fcb1af439287fe28 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 12:56:21 +0100 Subject: [PATCH 457/864] rename builds --- eng/pipelines/source-build-sdk-diff-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index efa6991a1..a7563b7d4 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -22,35 +22,35 @@ parameters: jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: CentOSStream8_Offline + buildName: CentOSStream8_Offline_MsftSdk targetRid: centos.8-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: CentOSStream9_Offline + buildName: CentOSStream9_Offline_MsftSdk targetRid: centos.9-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Fedora36_Offline + buildName: Fedora36_Offline_MsftSdk targetRid: fedora.36-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Ubuntu2004_Offline + buildName: Ubuntu2004_Offline_MsftSdk targetRid: ubuntu.2004-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Debian11_Offline + buildName: Debian11_Offline_MsftSdk targetRid: debian.11-arm64 architecture: arm64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} From 46a7322ce19ad2fbcd3517800949a811df20211a Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 12:59:00 +0100 Subject: [PATCH 458/864] query build by branch --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 5072e87e7..856df0809 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -24,15 +24,15 @@ jobs: dotnet_dotnet_build='${{ replace(parameters.dotnetDotnetRunId, ' ', '') }}' if [[ -z "$dotnet_dotnet_build" ]]; then - dotnet_dotnet_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) + dotnet_dotnet_build=$(az pipelines runs list --branch '$(Build.SourceBranch)' --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv) fi if [[ -z "$dotnet_dotnet_build" ]]; then - fail "Could not find a completed vmr build" + fail "Could not find a completed dotnet-dotnet build for branch '$(Build.SourceBranch)'" exit 1 fi - echo "Vmr build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" + echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) From 797a68496a327e426628cbb824b34352a9b5ac78 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 13:02:48 +0100 Subject: [PATCH 459/864] tag installer sha --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 856df0809..a8b1765e7 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -42,7 +42,8 @@ jobs: fi echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results" - + + echo "##vso[build.addbuildtag]installer-$installer_sha" echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build" echo "##vso[task.setvariable variable=DotnetDotnetBuildId]$dotnet_dotnet_build" displayName: Find associated builds From 16c0ead18a78fff1b0301d16cb1d2ded4afacc77 Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Mon, 6 Mar 2023 15:31:54 +0100 Subject: [PATCH 460/864] Update eng/pipelines/templates/jobs/sdk-diff-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index a8b1765e7..f406701ae 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -106,8 +106,8 @@ jobs: workingDirectory: $(Build.SourcesDirectory) - script: > - .dotnet/dotnet - test + .dotnet/dotnet test + $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' From a4ddd00e8cf7322fc8e41cd5211ae8e12e0418af Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Mon, 6 Mar 2023 15:32:17 +0100 Subject: [PATCH 461/864] Update eng/pipelines/templates/jobs/sdk-diff-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index f406701ae..f135ab727 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -86,7 +86,8 @@ jobs: msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) - if [[ -z $msft_sdk_tarball_name ]]; then + if [[ -z "$msft_sdk_tarball_name" ]]; then + fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" exit 1 fi From 64dfee55b904c65d0943b0ade54411736c1c9dc6 Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Mon, 6 Mar 2023 15:34:18 +0100 Subject: [PATCH 462/864] Update eng/pipelines/templates/jobs/sdk-diff-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index f135ab727..afea9f2b1 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -94,7 +94,8 @@ jobs: sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) - if [[ -z $sdk_tarball_name ]]; then + if [[ -z "$sdk_tarball_name" ]]; then + fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" exit 1 fi From c4a7570445e77ad9481aae6520d5fd1f796fc128 Mon Sep 17 00:00:00 2001 From: Milena Hristova Date: Mon, 6 Mar 2023 15:34:50 +0100 Subject: [PATCH 463/864] Update eng/pipelines/templates/jobs/sdk-diff-tests.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Přemek Vysoký --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index afea9f2b1..a2e9c72dc 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -135,4 +135,4 @@ jobs: searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults mergeTestResults: true publishRunAttachments: true - testRunTitle: SourceBuild_SdkComparisonTests_$(Agent.JobName) + testRunTitle: $(Agent.JobName) From 0c1fb44287f241bd241db16fb26768b2d20fb403 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 15:48:34 +0100 Subject: [PATCH 464/864] set path variable --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index a2e9c72dc..5cea086bb 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -82,8 +82,6 @@ jobs: checkDownloadedFiles: true - script: | - set -x - msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z "$msft_sdk_tarball_name" ]]; then @@ -102,8 +100,8 @@ jobs: eng/common/build.sh --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore - echo "##vso[task.setvariable variable=MsftSdkTarballName]$msft_sdk_tarball_name" - echo "##vso[task.setvariable variable=SdkTarballName]$sdk_tarball_name" + echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" + echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name" displayName: Prepare Tests workingDirectory: $(Build.SourcesDirectory) @@ -114,8 +112,8 @@ jobs: --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'console;verbosity=detailed' - -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$(MsftSdkTarballName) - -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$(SdkTarballName) + -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(MsftSdkTarballPath) + -e SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath) -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=false -e SMOKE_TESTS_RUNNING_IN_CI=true From d46e886f3a3c2608a51ec2974b9d5f29ac517941 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 15:49:29 +0100 Subject: [PATCH 465/864] rm empty line --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 5cea086bb..96f7f638e 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -107,7 +107,6 @@ jobs: - script: > .dotnet/dotnet test - $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' From c1f7ba0e11ff5d4b35c0ab0c5463a7ebc72e52b1 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 16:32:47 +0100 Subject: [PATCH 466/864] add message back --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 96f7f638e..da9227f2c 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -86,7 +86,7 @@ jobs: if [[ -z "$msft_sdk_tarball_name" ]]; then - fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" + fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results' might have failed." exit 1 fi @@ -94,7 +94,7 @@ jobs: if [[ -z "$sdk_tarball_name" ]]; then - fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'" + fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results' might have failed" exit 1 fi From a627b7fe71e738929eb3b187166424082a5ae609 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 16:54:56 +0100 Subject: [PATCH 467/864] fix variable name --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index da9227f2c..7e23ebc90 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -85,16 +85,14 @@ jobs: msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z "$msft_sdk_tarball_name" ]]; then - - fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results' might have failed." + fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$InstallerBuildId&view=results' might have failed." exit 1 fi sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) if [[ -z "$sdk_tarball_name" ]]; then - - fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results' might have failed" + fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$DotnetDotnetBuildId&view=results' might have failed" exit 1 fi From 063202c901d16166484b56333a3f8cde992ce9a4 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Mon, 6 Mar 2023 17:35:50 +0100 Subject: [PATCH 468/864] fix logging --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 7e23ebc90..c6e46ed9b 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -28,7 +28,7 @@ jobs: fi if [[ -z "$dotnet_dotnet_build" ]]; then - fail "Could not find a completed dotnet-dotnet build for branch '$(Build.SourceBranch)'" + echo "Could not find a completed dotnet-dotnet build for branch '$(Build.SourceBranch)'" exit 1 fi @@ -37,7 +37,7 @@ jobs: installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then - fail "Could not find a build of installer for commit '$installer_sha'" + echo "Could not find a build of installer for commit '$installer_sha'" exit 1 fi @@ -85,14 +85,14 @@ jobs: msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z "$msft_sdk_tarball_name" ]]; then - fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$InstallerBuildId&view=results' might have failed." + echo "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$(InstallerBuildId)&view=results' might have failed." exit 1 fi sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) if [[ -z "$sdk_tarball_name" ]]; then - fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$DotnetDotnetBuildId&view=results' might have failed" + echo "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$(DotnetDotnetBuildId)&view=results' might have failed" exit 1 fi 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 469/864] [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 aeb53228be13b5fff87efb4c1087196c42076199 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:34:54 +0000 Subject: [PATCH 470/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15707) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2e8853f0..bf3d107c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a3ee2277e860df151d33d72e9b7fabf1e564b3d8 + d39b541e03fa17cd05dfbbad144b32104a052586 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 471/864] [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 920639343ee88cd05b5e63b211163e274a0a6072 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 6 Mar 2023 12:46:49 -0800 Subject: [PATCH 472/864] Set ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch --- src/redist/redist.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index f1b2b8927..bbdb2a15f 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -5,6 +5,7 @@ false false true + none From b10b6137ee382a5c75e13caa3a4a0224cc11d793 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 6 Mar 2023 14:06:44 -0800 Subject: [PATCH 473/864] Update to latest SDK --- eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++-------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07c0e4bb9..c4c36c32c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - cb7e5ff415890c504daec498d9e0df3c0e71298c + e7b2675d5f0182f78aee3423aee1b825da7d07df - + https://github.com/dotnet/windowsdesktop - cb7e5ff415890c504daec498d9e0df3c0e71298c + e7b2675d5f0182f78aee3423aee1b825da7d07df - + https://github.com/dotnet/windowsdesktop - cb7e5ff415890c504daec498d9e0df3c0e71298c + e7b2675d5f0182f78aee3423aee1b825da7d07df - + https://github.com/dotnet/windowsdesktop - cb7e5ff415890c504daec498d9e0df3c0e71298c + e7b2675d5f0182f78aee3423aee1b825da7d07df - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 - + https://github.com/dotnet/aspnetcore - 39f36e753bc81d0589182218c16921576003d394 + b52555b008890d43c388608336fa86e3f2ac6018 https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 8b335293f9a1360fa5364506c22bd74c339c8648 + 4846f59fe168a343acfb84841f323fd47dd0e72c - + https://github.com/dotnet/sdk - 8b335293f9a1360fa5364506c22bd74c339c8648 + 4846f59fe168a343acfb84841f323fd47dd0e72c - + https://github.com/dotnet/sdk - 8b335293f9a1360fa5364506c22bd74c339c8648 + 4846f59fe168a343acfb84841f323fd47dd0e72c - + https://github.com/dotnet/sdk - 8b335293f9a1360fa5364506c22bd74c339c8648 + 4846f59fe168a343acfb84841f323fd47dd0e72c - + https://github.com/dotnet/winforms - a4be2a433854d32adcbbe394204cfa8cdd493d50 + 379c1d362960ba0aea74364a1ad9f5056809c6b9 - + https://github.com/dotnet/wpf - 26762c368454ab098ba60a0e979d53ff6af9b7ac + 61498ca2e9cbf22b24392586888b0c1c199d1465 - + https://github.com/dotnet/fsharp - 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce + ab771de3c23cebcf699e1753500a8649eb4b6272 - + https://github.com/dotnet/fsharp - 2f802c77efc09c63d3e36f50ca4380cbe5b4a5ce + ab771de3c23cebcf699e1753500a8649eb4b6272 @@ -142,13 +142,13 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 + c7537bdf261a7160836447ec46e1f136580a9fe4 - + https://github.com/dotnet/roslyn - 81404ba772fe054b1ccd1b4cc67a59d44967c926 + 1314d090671dc1a1500c5303c4b5ae9150f40d98 @@ -165,18 +165,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d7ff0aa47c680be543905cc1410e2f62b54dfefe + a680b9fd4129b003d681588927d623041432e781 - + https://github.com/dotnet/emsdk - a117e262c0c49e71a0017e96a0a1124ec990d05f + a680b9fd4129b003d681588927d623041432e781 - + https://github.com/dotnet/emsdk - a117e262c0c49e71a0017e96a0a1124ec990d05f + a680b9fd4129b003d681588927d623041432e781 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ecfa98fc8..c58d3d6d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23151.4 + 8.0.0-preview.3.23153.1 - 8.0.0-preview.3.23152.1 + 8.0.0-preview.3.23154.1 @@ -58,46 +58,46 @@ - 8.0.0-preview.3.23153.7 - 8.0.0-preview.3.23153.7 - 8.0.0-preview.3.23153.7 - 8.0.0-preview.3.23153.7 - 8.0.0-preview.3.23153.7 - 8.0.0-preview.3.23153.7 - 8.0.0-preview.3.23153.7 + 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23156.7 0.2.0 - 8.0.100-preview.3.23153.7 - 8.0.100-preview.3.23153.7 - 8.0.100-preview.3.23153.7 + 8.0.100-preview.3.23156.10 + 8.0.100-preview.3.23156.10 + 8.0.100-preview.3.23156.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.2.23127.4 + 8.0.0-preview.3.23156.2 - 8.0.0-preview.2.23127.4 - 8.0.0-preview.2.23127.4 - 8.0.0-preview.2.23127.4 - 8.0.0-preview.2.23127.4 - 8.0.0-preview.2.23127.4 - 8.0.0-preview.2.23127.4 + 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23156.2 2.1.0 - 8.0.0-preview.3.23152.3 - 8.0.0-preview.3.23152.3 - 8.0.0-preview.3.23152.3 - 8.0.0-preview.3.23152.3 + 8.0.0-preview.3.23154.3 + 8.0.0-preview.3.23154.3 + 8.0.0-preview.3.23154.3 + 8.0.0-preview.3.23154.3 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 474/864] [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 ba4273127c4d6862de7db5fb76c81b531978485b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Mar 2023 23:25:52 +0000 Subject: [PATCH 475/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230306.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23156.3 -> To Version 8.0.0-alpha.1.23156.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf3d107c2..d40e58bf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d39b541e03fa17cd05dfbbad144b32104a052586 + 63b96008dc8a54484d6a8e2b846c0ae441fa8986 From 82a21e98937a8fbc834157f7dd6f2ed36fc50cc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Mar 2023 01:47:27 +0000 Subject: [PATCH 476/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230306.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23156.3 -> To Version 8.0.0-alpha.1.23156.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d40e58bf9..565c08bbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 63b96008dc8a54484d6a8e2b846c0ae441fa8986 + e2279a0388f89a1f771ff7e4ded01f0e657bcafb From 97c30ca066e6f1ce95bf70af32ff0b3fd7251e82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Mar 2023 06:44:09 +0000 Subject: [PATCH 477/864] 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 83629ea0e723ce29c0e6860b08cd013710c2dbf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 07:47:02 -0800 Subject: [PATCH 478/864] [main] Update dependencies from dotnet/arcade (#15714) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 565c08bbf..aebe453c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa - + https://github.com/dotnet/arcade - 7f6d9796cc7f594772f798358dbdd8c69b6a97af + e4e5e16cf38c950ed835f8b223ebfdeca3e112aa https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 0d129b6ab..e43c23baf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23153.1 + 8.0.0-beta.23156.4 diff --git a/global.json b/global.json index a5a531b94..c5e037bc0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23153.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23153.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23156.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23156.4" } } From 5b6668f744e6c71c2ab17f79b9f17fcd5021e1c6 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 7 Mar 2023 08:54:55 -0800 Subject: [PATCH 479/864] Trim away netframework targets when building (#15716) --- eng/SourceBuild.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 9ebca97ff..5f49a5688 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -3,6 +3,7 @@ installer true + true From 07a37c4b79d710cc70249fca86e15ad4766ca39a Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:29 -0800 Subject: [PATCH 480/864] Update branding to 6.0.116 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 78a54dd2c..8e5148d0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 7f856954d35d2d311d39fb7f40ed144e7c9e7234 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:35 -0800 Subject: [PATCH 481/864] Update branding to 6.0.311 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 892fd05f5..75cc17a76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 333c78c32a7c43a51b5c51dcbbe382ca6492df08 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:39 -0800 Subject: [PATCH 482/864] Update branding to 6.0.408 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9376b1f5..6a7c8ae3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 4714d8cdf6ffd5519c7ad261668c059791e6cef4 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 7 Mar 2023 10:11:46 -0800 Subject: [PATCH 483/864] Update branding to 7.0.105 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dcdece83a..38f9d3f51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From bb91038a827521fd26f499e4b71e3ef1b4fd855f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 7 Mar 2023 10:22:58 -0800 Subject: [PATCH 484/864] 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 790a290b716c156d3faf0e701b521f9b6e0fbb0b 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:46:57 +0000 Subject: [PATCH 485/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15715) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aebe453c3..24cd1b51e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - e2279a0388f89a1f771ff7e4ded01f0e657bcafb + d367fbfb981c6bb7ad4c94f0441d04fe3c40909c 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 486/864] [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 240bdf1fe15f7badc48b54028b261484af52f6e6 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 7 Mar 2023 14:28:20 -0600 Subject: [PATCH 487/864] Update the property names too --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c58d3d6d3..9091029b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,10 +200,10 @@ 13.1.227-net8-p1 16.1.1015-net8-p1 - 8.0.0-preview.2.23113.1 - 8.0.0-preview.2.23108.1 - 8.0.0-preview.2.23108.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2PackageVersion) + 8.0.0-preview.3.23151.1 + 8.0.0-preview.3.23151.1 + 8.0.0-preview.3.23151.1 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview3PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From d0378c917907d50ca392f893c374e419b5ca19ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 02:11:55 +0000 Subject: [PATCH 488/864] 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 489/864] 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 24e2e68b4aea5bc9fa87b948537ed77210440a6f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Mar 2023 09:52:38 -0800 Subject: [PATCH 490/864] Automate Asp.net template updates in dotnet/installer --- eng/Versions.props | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 38f9d3f51..c816a7bd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,6 +103,19 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkPactchVersion.Split('-')[0]) + $(MicrosoftNETSdkPactchVersion.Substring(1)) + + $([MSBuild]::Add($(VersionFeature), 9)) + $([MSBuild]::Add($(AspNetCoreTemplateFeature60), 1)) 5.0.403 @@ -135,7 +148,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) From 88c6d20576914ee98b4c6d4a1c4471f52458f4e9 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Mar 2023 09:54:51 -0800 Subject: [PATCH 491/864] Fixup --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index c816a7bd3..698f403de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -116,6 +116,7 @@ --> $([MSBuild]::Add($(VersionFeature), 9)) $([MSBuild]::Add($(AspNetCoreTemplateFeature60), 1)) + 5.0.403 From 8a5d24ef41fcbf4cc62201ca53f5cdfd5b7689be Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Mar 2023 09:56:52 -0800 Subject: [PATCH 492/864] Spelling --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 698f403de..016c2c2d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,16 +106,16 @@ - $(MicrosoftNETSdkPackageVersion.Split('.')[2]) - $(MicrosoftNETSdkPactchVersion.Split('-')[0]) - $(MicrosoftNETSdkPactchVersion.Substring(1)) + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkPactchVersion.Split('-')[0]) + $(MicrosoftNETSdkPactchVersion.Substring(1)) $([MSBuild]::Add($(VersionFeature), 9)) - $([MSBuild]::Add($(AspNetCoreTemplateFeature60), 1)) + $([MSBuild]::Add($(AspNetCoreTemplateFeature60), 1)) From 17883b783a906dd6c6399707fe06a2f87c5f71be Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Mar 2023 09:57:18 -0800 Subject: [PATCH 493/864] More spelling --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 016c2c2d9..cf7bd222c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,8 +107,8 @@ $(MicrosoftNETSdkPackageVersion.Split('.')[2]) - $(MicrosoftNETSdkPactchVersion.Split('-')[0]) - $(MicrosoftNETSdkPactchVersion.Substring(1)) + $(MicrosoftNETSdkPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkPatchVersion.Substring(1)) 1.1.0-rc.22558.1 - 1.1.0-rc.22558.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 + 1.1.0-rc.23115.1 From 5840707c6ced50f231beed36e23038298bf0f1e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:53:39 +0000 Subject: [PATCH 496/864] [main] Update dependencies from dotnet/sdk (#15735) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++--------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c6a9fcfe..e8f333eab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - e7b2675d5f0182f78aee3423aee1b825da7d07df + 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/windowsdesktop - e7b2675d5f0182f78aee3423aee1b825da7d07df + 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/windowsdesktop - e7b2675d5f0182f78aee3423aee1b825da7d07df + 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/windowsdesktop - e7b2675d5f0182f78aee3423aee1b825da7d07df + 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc - + https://github.com/dotnet/aspnetcore - b52555b008890d43c388608336fa86e3f2ac6018 + 4f356a28a972abe2b66133128310800e66208bdc https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4846f59fe168a343acfb84841f323fd47dd0e72c + 3cfce0150be39f4efd9b482a7ea12dae6a40314d - + https://github.com/dotnet/sdk - 4846f59fe168a343acfb84841f323fd47dd0e72c + 3cfce0150be39f4efd9b482a7ea12dae6a40314d - + https://github.com/dotnet/sdk - 4846f59fe168a343acfb84841f323fd47dd0e72c + 3cfce0150be39f4efd9b482a7ea12dae6a40314d - + https://github.com/dotnet/sdk - 4846f59fe168a343acfb84841f323fd47dd0e72c + 3cfce0150be39f4efd9b482a7ea12dae6a40314d - + https://github.com/dotnet/winforms - 379c1d362960ba0aea74364a1ad9f5056809c6b9 + 41b11b6a7290a2bbc0c293042f30d9632e55aae2 - + https://github.com/dotnet/wpf - 61498ca2e9cbf22b24392586888b0c1c199d1465 + a9894d8820de6e620f3919f2bb2eda46c682e823 - + https://github.com/dotnet/fsharp - ab771de3c23cebcf699e1753500a8649eb4b6272 + 4cdbc87af42914536422ce1609a59fbfd52cc1ff - + https://github.com/dotnet/fsharp - ab771de3c23cebcf699e1753500a8649eb4b6272 + 4cdbc87af42914536422ce1609a59fbfd52cc1ff @@ -142,18 +142,18 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - c7537bdf261a7160836447ec46e1f136580a9fe4 + 6c836e84131f5f4d44bb5384e6a812571c528ddd https://github.com/dotnet/roslyn 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 47a712160eb420136ec983be5e0f412dc1c25b55 + 1a6d753a7648baf0cc991af0c0d254a41d36eba6 @@ -165,18 +165,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - a680b9fd4129b003d681588927d623041432e781 + 4c1f185a78249c6974c1f6c248dad189fe70497b - + https://github.com/dotnet/emsdk - a680b9fd4129b003d681588927d623041432e781 + 4c1f185a78249c6974c1f6c248dad189fe70497b - + https://github.com/dotnet/emsdk - a680b9fd4129b003d681588927d623041432e781 + 4c1f185a78249c6974c1f6c248dad189fe70497b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 32b3932ec..ceb3be31c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23153.1 + 8.0.0-preview.3.23156.2 - 8.0.0-preview.3.23154.1 + 8.0.0-preview.3.23157.1 @@ -58,46 +58,46 @@ - 8.0.0-preview.3.23156.7 - 8.0.0-preview.3.23156.7 - 8.0.0-preview.3.23156.7 - 8.0.0-preview.3.23156.7 - 8.0.0-preview.3.23156.7 - 8.0.0-preview.3.23156.7 - 8.0.0-preview.3.23156.7 + 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23157.27 0.2.0 - 8.0.100-preview.3.23156.10 - 8.0.100-preview.3.23156.10 - 8.0.100-preview.3.23156.10 + 8.0.100-preview.3.23158.11 + 8.0.100-preview.3.23158.11 + 8.0.100-preview.3.23158.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23158.3 - 8.0.0-preview.3.23156.2 - 8.0.0-preview.3.23156.2 - 8.0.0-preview.3.23156.2 - 8.0.0-preview.3.23156.2 - 8.0.0-preview.3.23156.2 - 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.3 2.1.0 - 8.0.0-preview.3.23154.3 - 8.0.0-preview.3.23154.3 - 8.0.0-preview.3.23154.3 - 8.0.0-preview.3.23154.3 + 8.0.0-preview.3.23157.3 + 8.0.0-preview.3.23157.3 + 8.0.0-preview.3.23157.3 + 8.0.0-preview.3.23157.3 @@ -200,9 +200,9 @@ 13.1.227-net8-p1 16.1.1015-net8-p1 - 8.0.0-preview.3.23151.1 - 8.0.0-preview.3.23151.1 - 8.0.0-preview.3.23151.1 + 8.0.0-preview.3.23156.1 + 8.0.0-preview.3.23156.1 + 8.0.0-preview.3.23156.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview3PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From aec60b6eef21ff8534e613d00c0874b9bcb09243 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 21:07:19 +0000 Subject: [PATCH 497/864] [main] Update dependencies from dotnet/sdk (#15739) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.3.23157.27 to 8.0.0-preview.3.23158.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8f333eab..60cb90ef8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 6c836e84131f5f4d44bb5384e6a812571c528ddd - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 - + https://github.com/dotnet/aspnetcore - 4f356a28a972abe2b66133128310800e66208bdc + bb4153237f491dc39fe36482bb09b378bb863125 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3cfce0150be39f4efd9b482a7ea12dae6a40314d + c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 - + https://github.com/dotnet/sdk - 3cfce0150be39f4efd9b482a7ea12dae6a40314d + c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 - + https://github.com/dotnet/sdk - 3cfce0150be39f4efd9b482a7ea12dae6a40314d + c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 - + https://github.com/dotnet/sdk - 3cfce0150be39f4efd9b482a7ea12dae6a40314d + c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 diff --git a/eng/Versions.props b/eng/Versions.props index ceb3be31c..b82bad710 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23157.27 - 8.0.0-preview.3.23157.27 - 8.0.0-preview.3.23157.27 - 8.0.0-preview.3.23157.27 - 8.0.0-preview.3.23157.27 - 8.0.0-preview.3.23157.27 - 8.0.0-preview.3.23157.27 + 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.5 0.2.0 - 8.0.100-preview.3.23158.11 - 8.0.100-preview.3.23158.11 - 8.0.100-preview.3.23158.11 + 8.0.100-preview.3.23158.18 + 8.0.100-preview.3.23158.18 + 8.0.100-preview.3.23158.18 $(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 498/864] [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 2391886f813ad671388f6574194cf26bb8e830eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 21:35:59 +0000 Subject: [PATCH 499/864] Update dependencies from https://github.com/dotnet/sdk build 20230308.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23158.18 -> To Version 8.0.100-preview.3.23158.21 --- 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 60cb90ef8..fc10036f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 + 013df636d56dfdc9174bea752c75c7db15d07cfd - + https://github.com/dotnet/sdk - c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 + 013df636d56dfdc9174bea752c75c7db15d07cfd - + https://github.com/dotnet/sdk - c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 + 013df636d56dfdc9174bea752c75c7db15d07cfd - + https://github.com/dotnet/sdk - c9458673c7dec9d4db2dd038b1bf3d70c59f56e0 + 013df636d56dfdc9174bea752c75c7db15d07cfd diff --git a/eng/Versions.props b/eng/Versions.props index b82bad710..4eaeac49c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23158.18 - 8.0.100-preview.3.23158.18 - 8.0.100-preview.3.23158.18 + 8.0.100-preview.3.23158.21 + 8.0.100-preview.3.23158.21 + 8.0.100-preview.3.23158.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c35f3f3a3598fe865648a3880779d8780e34b197 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Mar 2023 22:43:10 +0000 Subject: [PATCH 500/864] Update dependencies from https://github.com/dotnet/sdk build 20230308.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23158.18 -> To Version 8.0.100-preview.3.23158.26 --- 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 fc10036f9..af4a44c50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 013df636d56dfdc9174bea752c75c7db15d07cfd + af67718a9fce6ba01796ed06df44299fe17da67b - + https://github.com/dotnet/sdk - 013df636d56dfdc9174bea752c75c7db15d07cfd + af67718a9fce6ba01796ed06df44299fe17da67b - + https://github.com/dotnet/sdk - 013df636d56dfdc9174bea752c75c7db15d07cfd + af67718a9fce6ba01796ed06df44299fe17da67b - + https://github.com/dotnet/sdk - 013df636d56dfdc9174bea752c75c7db15d07cfd + af67718a9fce6ba01796ed06df44299fe17da67b diff --git a/eng/Versions.props b/eng/Versions.props index 4eaeac49c..6845d961d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23158.21 - 8.0.100-preview.3.23158.21 - 8.0.100-preview.3.23158.21 + 8.0.100-preview.3.23158.26 + 8.0.100-preview.3.23158.26 + 8.0.100-preview.3.23158.26 $(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 501/864] [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 a180efbaaa63790830588900c8f916f2a8cbb5b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 00:06:13 +0000 Subject: [PATCH 502/864] Update dependencies from https://github.com/dotnet/sdk build 20230308.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23158.18 -> To Version 8.0.100-preview.3.23158.29 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.2.29 -> To Version 6.6.0-preview.3.42 (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 af4a44c50..f419793c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - af67718a9fce6ba01796ed06df44299fe17da67b + ba9f22336a5ba0b7451057aabe37d9f1df08cc5e - + https://github.com/dotnet/sdk - af67718a9fce6ba01796ed06df44299fe17da67b + ba9f22336a5ba0b7451057aabe37d9f1df08cc5e - + https://github.com/dotnet/sdk - af67718a9fce6ba01796ed06df44299fe17da67b + ba9f22336a5ba0b7451057aabe37d9f1df08cc5e - + https://github.com/dotnet/sdk - af67718a9fce6ba01796ed06df44299fe17da67b + ba9f22336a5ba0b7451057aabe37d9f1df08cc5e @@ -156,9 +156,9 @@ 1a6d753a7648baf0cc991af0c0d254a41d36eba6 - + https://github.com/nuget/nuget.client - 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 + 9ebbe50f56c5e508f631946f1424fe93934b329c diff --git a/eng/Versions.props b/eng/Versions.props index 6845d961d..307a57ad9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23158.26 - 8.0.100-preview.3.23158.26 - 8.0.100-preview.3.23158.26 + 8.0.100-preview.3.23158.29 + 8.0.100-preview.3.23158.29 + 8.0.100-preview.3.23158.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9f7b39a77580baf1dfdee542605186d5358c974b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 03:14:35 +0000 Subject: [PATCH 503/864] Update dependencies from https://github.com/dotnet/sdk build 20230308.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23158.29 -> To Version 8.0.100-preview.3.23158.40 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23158.3 -> To Version 8.0.0-preview.3.23158.15 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f419793c3..d03277744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ba9f22336a5ba0b7451057aabe37d9f1df08cc5e + 725b93c957aa29079203f506a44625c1332f3a5e - + https://github.com/dotnet/sdk - ba9f22336a5ba0b7451057aabe37d9f1df08cc5e + 725b93c957aa29079203f506a44625c1332f3a5e - + https://github.com/dotnet/sdk - ba9f22336a5ba0b7451057aabe37d9f1df08cc5e + 725b93c957aa29079203f506a44625c1332f3a5e - + https://github.com/dotnet/sdk - ba9f22336a5ba0b7451057aabe37d9f1df08cc5e + 725b93c957aa29079203f506a44625c1332f3a5e @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 6c836e84131f5f4d44bb5384e6a812571c528ddd + 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 307a57ad9..5db69e644 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23158.29 - 8.0.100-preview.3.23158.29 - 8.0.100-preview.3.23158.29 + 8.0.100-preview.3.23158.40 + 8.0.100-preview.3.23158.40 + 8.0.100-preview.3.23158.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.15 - 8.0.0-preview.3.23158.3 - 8.0.0-preview.3.23158.3 - 8.0.0-preview.3.23158.3 - 8.0.0-preview.3.23158.3 - 8.0.0-preview.3.23158.3 - 8.0.0-preview.3.23158.3 + 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.15 2.1.0 From b73f98cba4d9126e86964f63f0e9ecf4e7a16ee7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 06:43:50 +0000 Subject: [PATCH 504/864] Update dependencies from https://github.com/dotnet/sdk build 20230308.51 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23158.40 -> To Version 8.0.100-preview.3.23158.51 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23158.15 -> To Version 8.0.0-preview.3.23158.17 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d03277744..1ed99d045 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 - + https://github.com/dotnet/aspnetcore - bb4153237f491dc39fe36482bb09b378bb863125 + 34a16dcf5043b4f02756e9d0727943c385cd2810 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 725b93c957aa29079203f506a44625c1332f3a5e + cfd165eea1b530fbc8926b1924666b47088304a7 - + https://github.com/dotnet/sdk - 725b93c957aa29079203f506a44625c1332f3a5e + cfd165eea1b530fbc8926b1924666b47088304a7 - + https://github.com/dotnet/sdk - 725b93c957aa29079203f506a44625c1332f3a5e + cfd165eea1b530fbc8926b1924666b47088304a7 - + https://github.com/dotnet/sdk - 725b93c957aa29079203f506a44625c1332f3a5e + cfd165eea1b530fbc8926b1924666b47088304a7 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 633dcab4b1d665dc355d0acd5ca6c6ba8a4ae059 + 1b2eb12a711410a358bdfa93af017a34a929d4cf https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 5db69e644..d2cf637aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,38 +58,38 @@ - 8.0.0-preview.3.23158.5 - 8.0.0-preview.3.23158.5 - 8.0.0-preview.3.23158.5 - 8.0.0-preview.3.23158.5 - 8.0.0-preview.3.23158.5 - 8.0.0-preview.3.23158.5 - 8.0.0-preview.3.23158.5 + 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23158.16 0.2.0 - 8.0.100-preview.3.23158.40 - 8.0.100-preview.3.23158.40 - 8.0.100-preview.3.23158.40 + 8.0.100-preview.3.23158.51 + 8.0.100-preview.3.23158.51 + 8.0.100-preview.3.23158.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.17 - 8.0.0-preview.3.23158.15 - 8.0.0-preview.3.23158.15 - 8.0.0-preview.3.23158.15 - 8.0.0-preview.3.23158.15 - 8.0.0-preview.3.23158.15 - 8.0.0-preview.3.23158.15 + 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.17 2.1.0 From 15f10dbff379a85f4bd8e649242cff382fdaf627 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 07:43:50 +0000 Subject: [PATCH 505/864] 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) From d27eaffc077f48668dcfa3ed4eeb708e58ede3f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Mar 2023 07:49:30 +0000 Subject: [PATCH 506/864] Update dependencies from https://github.com/dotnet/sdk build 20230308.53 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23158.40 -> To Version 8.0.100-preview.3.23158.53 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23158.15 -> To Version 8.0.0-preview.3.23158.17 (parent: Microsoft.NET.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 1ed99d045..cf6ae087a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - cfd165eea1b530fbc8926b1924666b47088304a7 + e5531d2e8d182f11bcc50f7b086124f8a6210612 - + https://github.com/dotnet/sdk - cfd165eea1b530fbc8926b1924666b47088304a7 + e5531d2e8d182f11bcc50f7b086124f8a6210612 - + https://github.com/dotnet/sdk - cfd165eea1b530fbc8926b1924666b47088304a7 + e5531d2e8d182f11bcc50f7b086124f8a6210612 - + https://github.com/dotnet/sdk - cfd165eea1b530fbc8926b1924666b47088304a7 + e5531d2e8d182f11bcc50f7b086124f8a6210612 diff --git a/eng/Versions.props b/eng/Versions.props index d2cf637aa..4733ead5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23158.51 - 8.0.100-preview.3.23158.51 - 8.0.100-preview.3.23158.51 + 8.0.100-preview.3.23158.53 + 8.0.100-preview.3.23158.53 + 8.0.100-preview.3.23158.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99911e89180f0255eedec8830f02e0d746b300fc Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 9 Mar 2023 11:31:05 +0100 Subject: [PATCH 507/864] publish build logs --- .../templates/jobs/sdk-diff-tests.yml | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index c6e46ed9b..916edbbf1 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -96,7 +96,7 @@ jobs: exit 1 fi - eng/common/build.sh --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore + eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name" @@ -109,6 +109,10 @@ jobs: --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'console;verbosity=detailed' + -c Release + -bl:$(Build.SourcesDirectory)/artifacts/log/Debug/BuildTests_$(date +"%m%d%H%M%S").binlog + -flp:LogFile=$(Build.SourcesDirectory)/artifacts/logs/BuildTests_$(date +"%m%d%H%M%S").log + -clp:v=m -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(MsftSdkTarballPath) -e SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath) -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= @@ -120,6 +124,28 @@ jobs: displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) + - script: | + set -x + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + cd "$(Build.SourcesDirectory)" + find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \; + cd "$(Build.SourcesDirectory)/src/SourceBuild/content" + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + - task: PublishTestResults@2 displayName: Publish Test Results condition: succeededOrFailed() From e53bf9d628e51c9c34b43836b25e8990a719b198 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 12:32:34 +0000 Subject: [PATCH 508/864] [main] Update dependencies from dotnet/sdk (#15749) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23157-03 to 17.6.0-preview-23159-01 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.17 to 8.0.0-preview.3.23158.25 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf6ae087a..d24604a6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - e5531d2e8d182f11bcc50f7b086124f8a6210612 + 7ef62da023bceb530e409b0492ead4fd52a78969 - + https://github.com/dotnet/sdk - e5531d2e8d182f11bcc50f7b086124f8a6210612 + 7ef62da023bceb530e409b0492ead4fd52a78969 - + https://github.com/dotnet/sdk - e5531d2e8d182f11bcc50f7b086124f8a6210612 + 7ef62da023bceb530e409b0492ead4fd52a78969 - + https://github.com/dotnet/sdk - e5531d2e8d182f11bcc50f7b086124f8a6210612 + 7ef62da023bceb530e409b0492ead4fd52a78969 @@ -142,18 +142,18 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 1b2eb12a711410a358bdfa93af017a34a929d4cf + 97de75b51230212b04883cddb3f261587684ca78 https://github.com/dotnet/roslyn 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 1a6d753a7648baf0cc991af0c0d254a41d36eba6 + 0fb1955ea9708d3b8f817dfa193af0edf5dd3991 diff --git a/eng/Versions.props b/eng/Versions.props index 4733ead5d..6969ee5a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23158.53 - 8.0.100-preview.3.23158.53 - 8.0.100-preview.3.23158.53 + 8.0.100-preview.3.23159.9 + 8.0.100-preview.3.23159.9 + 8.0.100-preview.3.23159.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.25 - 8.0.0-preview.3.23158.17 - 8.0.0-preview.3.23158.17 - 8.0.0-preview.3.23158.17 - 8.0.0-preview.3.23158.17 - 8.0.0-preview.3.23158.17 - 8.0.0-preview.3.23158.17 + 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23158.25 2.1.0 From 06d8f65377890c453ca75d51754a642a6eb7d366 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Thu, 9 Mar 2023 17:27:32 +0100 Subject: [PATCH 509/864] remove parameter --- eng/pipelines/templates/stages/vmr-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 3150345ea..a24c03295 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -96,7 +96,6 @@ stages: buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ - excludeSdkContentTests: true # ✅ overrideDistroDisablingSha1: false # 🚫 runOnline: true # ✅ withPreviousSDK: true # ✅ From 176efa10b14af2792aaaa3f90c2f8074b523f29d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 21:19:02 +0000 Subject: [PATCH 510/864] [main] Update dependencies from dotnet/sdk (#15753) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.3.23158.16 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23158.1 to 12.5.0-beta.23158.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23158.1 to 7.0.300-beta.23158.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23159-01 to 17.6.0-preview-23159-04 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23158.25 to 8.0.0-preview.3.23159.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++-------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d24604a6f..a34c0c1cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae - + https://github.com/dotnet/aspnetcore - 34a16dcf5043b4f02756e9d0727943c385cd2810 + 5b70808e0b6aba16359287629349c3267111f8ae https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 7ef62da023bceb530e409b0492ead4fd52a78969 + 5a2edd2ee3e84a2e15e949d7343526740c3f039d - + https://github.com/dotnet/sdk - 7ef62da023bceb530e409b0492ead4fd52a78969 + 5a2edd2ee3e84a2e15e949d7343526740c3f039d - + https://github.com/dotnet/sdk - 7ef62da023bceb530e409b0492ead4fd52a78969 + 5a2edd2ee3e84a2e15e949d7343526740c3f039d - + https://github.com/dotnet/sdk - 7ef62da023bceb530e409b0492ead4fd52a78969 + 5a2edd2ee3e84a2e15e949d7343526740c3f039d @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf a9894d8820de6e620f3919f2bb2eda46c682e823 - + https://github.com/dotnet/fsharp - 4cdbc87af42914536422ce1609a59fbfd52cc1ff + 225eaa6ddb994e7c74c7eac1e301f688366f1b78 - + https://github.com/dotnet/fsharp - 4cdbc87af42914536422ce1609a59fbfd52cc1ff + 225eaa6ddb994e7c74c7eac1e301f688366f1b78 @@ -142,18 +142,18 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 97de75b51230212b04883cddb3f261587684ca78 + 5c7e6d65a57f89725020b682eef2692dc73a64f8 https://github.com/dotnet/roslyn 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 0fb1955ea9708d3b8f817dfa193af0edf5dd3991 + a0c282787d59ca9a449ded85175f39030e5077b8 diff --git a/eng/Versions.props b/eng/Versions.props index 6969ee5a4..45ce84d18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,38 +58,38 @@ - 8.0.0-preview.3.23158.16 - 8.0.0-preview.3.23158.16 - 8.0.0-preview.3.23158.16 - 8.0.0-preview.3.23158.16 - 8.0.0-preview.3.23158.16 - 8.0.0-preview.3.23158.16 - 8.0.0-preview.3.23158.16 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 0.2.0 - 8.0.100-preview.3.23159.9 - 8.0.100-preview.3.23159.9 - 8.0.100-preview.3.23159.9 + 8.0.100-preview.3.23159.13 + 8.0.100-preview.3.23159.13 + 8.0.100-preview.3.23159.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23158.25 - 8.0.0-preview.3.23158.25 - 8.0.0-preview.3.23158.25 - 8.0.0-preview.3.23158.25 - 8.0.0-preview.3.23158.25 - 8.0.0-preview.3.23158.25 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.3 2.1.0 From 25cee5c1fe7eb5f229c89cf0dbf24b181c82ad97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 21:20:29 +0000 Subject: [PATCH 511/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15751) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a34c0c1cd..70ba29758 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -220,9 +220,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d367fbfb981c6bb7ad4c94f0441d04fe3c40909c + a848f811a52d75494029e663cd0a799be11744fe From 93a37b271934a37c4c7eab50a917b7214975d3e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 21:20:52 +0000 Subject: [PATCH 512/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15754) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23158.5 to 12.5.0-beta.23159.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23158.5 to 7.0.300-beta.23159.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23159-01 to 17.6.0-preview-23159-04 (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 52f99ca71..3e74d5737 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa - + https://github.com/dotnet/sdk - 7161acd500b1f061e3ab9711d83f4d9c0ca92b0c + d056bba338c787ebc9145f8f95e838b799a8b0fa @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 225eaa6ddb994e7c74c7eac1e301f688366f1b78 + 99ecffb8525b48caf64ac3108680b7b251fb4e89 - + https://github.com/dotnet/fsharp - 225eaa6ddb994e7c74c7eac1e301f688366f1b78 + 99ecffb8525b48caf64ac3108680b7b251fb4e89 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 0fb1955ea9708d3b8f817dfa193af0edf5dd3991 + a0c282787d59ca9a449ded85175f39030e5077b8 diff --git a/eng/Versions.props b/eng/Versions.props index c4532e380..2bb7fd6eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23158.52 - 7.0.300-preview.23158.52 - 7.0.300-preview.23158.52 + 7.0.300-preview.23159.11 + 7.0.300-preview.23159.11 + 7.0.300-preview.23159.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 38339e31c2969d42a77a0cc6e796405e08791402 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 9 Mar 2023 17:04:49 -0600 Subject: [PATCH 513/864] Use a stable transport package to aquire the emsdk package version --- eng/Version.Details.xml | 12 ++---------- eng/Versions.props | 6 ++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70ba29758..baf0a2102 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,19 +165,11 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 4c1f185a78249c6974c1f6c248dad189fe70497b + b211c38c398416b516ffab1806b8ba47d49c42da - - https://github.com/dotnet/emsdk - 4c1f185a78249c6974c1f6c248dad189fe70497b - - - https://github.com/dotnet/emsdk - 4c1f185a78249c6974c1f6c248dad189fe70497b - https://github.com/dotnet/deployment-tools c3ad00ae84489071080a606f6a8e43c9a91a5cc2 diff --git a/eng/Versions.props b/eng/Versions.props index 45ce84d18..814ac3325 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,10 +200,8 @@ 13.1.227-net8-p1 16.1.1015-net8-p1 - 8.0.0-preview.3.23156.1 - 8.0.0-preview.3.23156.1 - 8.0.0-preview.3.23156.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview3PackageVersion) + 8.0.0-preview.3.23159.3 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 43a4d99ea1c03d700f03eb1b9a7a7364c6b4ef19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:34:43 -0800 Subject: [PATCH 514/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15760) 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 3e74d5737..2dd93364b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f - + https://github.com/dotnet/sdk - d056bba338c787ebc9145f8f95e838b799a8b0fa + 450e0f6167fccd851825e46d397fd8a39108de7f @@ -154,9 +154,9 @@ a0c282787d59ca9a449ded85175f39030e5077b8 - + https://github.com/nuget/nuget.client - 9ebbe50f56c5e508f631946f1424fe93934b329c + f49ca00e27297fe7b4b82a2557d5b0caad907a06 diff --git a/eng/Versions.props b/eng/Versions.props index 2bb7fd6eb..3fd1f976e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23159.11 - 7.0.300-preview.23159.11 - 7.0.300-preview.23159.11 + 7.0.300-preview.23159.17 + 7.0.300-preview.23159.17 + 7.0.300-preview.23159.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1885389cd7fa25a04037e45d2760573d995f6293 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 00:14:31 +0000 Subject: [PATCH 515/864] [main] Update dependencies from dotnet/sdk (#15759) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.3.42 to 6.6.0-preview.3.43 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23159.3 to 8.0.0-preview.3.23159.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70ba29758..98d244f02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 100e9b111742e2499c70782dd656c30706491a30 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 5a2edd2ee3e84a2e15e949d7343526740c3f039d + f403c010ac568828c62ee6497ecfb38696e26b12 - + https://github.com/dotnet/sdk - 5a2edd2ee3e84a2e15e949d7343526740c3f039d + f403c010ac568828c62ee6497ecfb38696e26b12 - + https://github.com/dotnet/sdk - 5a2edd2ee3e84a2e15e949d7343526740c3f039d + f403c010ac568828c62ee6497ecfb38696e26b12 - + https://github.com/dotnet/sdk - 5a2edd2ee3e84a2e15e949d7343526740c3f039d + f403c010ac568828c62ee6497ecfb38696e26b12 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 5c7e6d65a57f89725020b682eef2692dc73a64f8 + a92ed6e2ce778c8b18dfa66f8f75368eca901f99 https://github.com/dotnet/roslyn @@ -156,9 +156,9 @@ a0c282787d59ca9a449ded85175f39030e5077b8 - + https://github.com/nuget/nuget.client - 9ebbe50f56c5e508f631946f1424fe93934b329c + f49ca00e27297fe7b4b82a2557d5b0caad907a06 diff --git a/eng/Versions.props b/eng/Versions.props index 45ce84d18..81fae4c4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23159.13 - 8.0.100-preview.3.23159.13 - 8.0.100-preview.3.23159.13 + 8.0.100-preview.3.23159.20 + 8.0.100-preview.3.23159.20 + 8.0.100-preview.3.23159.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23159.4 2.1.0 From a4d57dc25c710df7e5d8629955a944e164ca69a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Mar 2023 06:44:19 +0000 Subject: [PATCH 516/864] Update dependencies from https://github.com/dotnet/sdk build 20230309.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.17 -> To Version 7.0.300-preview.23159.32 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23159-04 -> To Version 17.6.0-preview-23160-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 2dd93364b..17dbc774b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 - + https://github.com/dotnet/sdk - 450e0f6167fccd851825e46d397fd8a39108de7f + 3281b6cbf4e63264ccc24716d0cb1053164af8a1 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - a0c282787d59ca9a449ded85175f39030e5077b8 + 15dea1b35cc21461d56f3fefcc332664da5840f7 diff --git a/eng/Versions.props b/eng/Versions.props index 3fd1f976e..d437daaff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23159.17 - 7.0.300-preview.23159.17 - 7.0.300-preview.23159.17 + 7.0.300-preview.23159.32 + 7.0.300-preview.23159.32 + 7.0.300-preview.23159.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 200e8137b71521a0ac606a497656fd3c29ecc84a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Mar 2023 09:54:56 +0000 Subject: [PATCH 517/864] Update dependencies from https://github.com/dotnet/sdk build 20230310.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.2 --- 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 17dbc774b..69eab1bf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee - + https://github.com/dotnet/sdk - 3281b6cbf4e63264ccc24716d0cb1053164af8a1 + b61c39085096854daeb0851edfeb9d147431ccee diff --git a/eng/Versions.props b/eng/Versions.props index d437daaff..322d5954c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23159.32 - 7.0.300-preview.23159.32 - 7.0.300-preview.23159.32 + 7.0.300-preview.23160.2 + 7.0.300-preview.23160.2 + 7.0.300-preview.23160.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6a0adcbcc06d7d37616dbb25590ebe883f257d4b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 10 Mar 2023 10:12:51 -0800 Subject: [PATCH 518/864] Generalize --- eng/Versions.props | 20 +++++++++++++------ .../targets/GenerateBundledVersions.targets | 7 ------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index cf7bd222c..cf490c3d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,6 +19,12 @@ true release + + 30 + 32 + 17 + $([MSBuild]::Add($(VersionFeature), 11)) + @@ -106,23 +112,25 @@ - $(MicrosoftNETSdkPackageVersion.Split('.')[2]) - $(MicrosoftNETSdkPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) $(MicrosoftNETSdkPatchVersion.Substring(1)) - $([MSBuild]::Add($(VersionFeature), 9)) - $([MSBuild]::Add($(AspNetCoreTemplateFeature60), 1)) + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) 5.0.403 6.0.302 - 5.0.13 - 6.0.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 50f1ae43c..60d7ecde1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -59,13 +59,6 @@ - - 30 - 32 - 17 - $([MSBuild]::Add($(VersionFeature), 11)) - - Microsoft.NETCoreSdk.BundledVersions.props From 06070d10f621b7c0410f6563a7a8dc4c798ff1cc Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 10 Mar 2023 10:18:12 -0800 Subject: [PATCH 519/864] Fixup --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cf490c3d8..56980e09a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,7 +114,7 @@ $(MicrosoftNETSdkPackageVersion.Split('.')[2]) $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) - $(MicrosoftNETSdkPatchVersion.Substring(1)) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) @@ -154,9 +154,9 @@ 15dea1b35cc21461d56f3fefcc332664da5840f7 - + https://github.com/nuget/nuget.client - f49ca00e27297fe7b4b82a2557d5b0caad907a06 + 3ab7d1462029e0b211a88040c952c9b8a679708d diff --git a/eng/Versions.props b/eng/Versions.props index 322d5954c..d0b552c96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.2 - 7.0.300-preview.23160.2 - 7.0.300-preview.23160.2 + 7.0.300-preview.23160.18 + 7.0.300-preview.23160.18 + 7.0.300-preview.23160.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc88fae6a5fe58a20eff5490cc5043dfbc93051e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Mar 2023 00:07:59 +0000 Subject: [PATCH 522/864] Update dependencies from https://github.com/dotnet/sdk build 20230310.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.25 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.43 -> To Version 6.6.0-preview.3.44 (parent: Microsoft.NET.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 4fb4d52b1..b1ec674fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada - + https://github.com/dotnet/sdk - f91626fc4bb3a996340b66a9adc6edf0a764e144 + 9cec2011b88f97b414d271f35882d555143d4ada diff --git a/eng/Versions.props b/eng/Versions.props index d0b552c96..8c7c94c55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.18 - 7.0.300-preview.23160.18 - 7.0.300-preview.23160.18 + 7.0.300-preview.23160.25 + 7.0.300-preview.23160.25 + 7.0.300-preview.23160.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9794e7097d8044bd1737bd8ff326618ce95563fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Mar 2023 01:06:19 +0000 Subject: [PATCH 523/864] Update dependencies from https://github.com/dotnet/sdk build 20230310.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.27 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.6.0-preview-23160-01 -> To Version 17.6.0-preview-23160-02 (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 b1ec674fc..db0ede573 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 - + https://github.com/dotnet/sdk - 9cec2011b88f97b414d271f35882d555143d4ada + 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 15dea1b35cc21461d56f3fefcc332664da5840f7 + 20614d22a579d73f632d5d4c7449f1ff93a2ad81 diff --git a/eng/Versions.props b/eng/Versions.props index 8c7c94c55..711fa1510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.25 - 7.0.300-preview.23160.25 - 7.0.300-preview.23160.25 + 7.0.300-preview.23160.27 + 7.0.300-preview.23160.27 + 7.0.300-preview.23160.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 636052dd0ce77163aec3ecf681b880aa51d5319b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 03:06:49 +0000 Subject: [PATCH 524/864] Update dependencies from https://github.com/dotnet/sdk build 20230312.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23160.27 -> To Version 7.0.300-preview.23162.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23159.2 -> To Version 12.5.0-beta.23161.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 db0ede573..9538dda25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 - + https://github.com/dotnet/sdk - 5de8e6824e0bcfdb13ef7cf7a326755799ab5181 + 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 99ecffb8525b48caf64ac3108680b7b251fb4e89 + 50ede7324c833488ee6769b18662d0e7be31c862 - + https://github.com/dotnet/fsharp - 99ecffb8525b48caf64ac3108680b7b251fb4e89 + 50ede7324c833488ee6769b18662d0e7be31c862 diff --git a/eng/Versions.props b/eng/Versions.props index 711fa1510..c19930873 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23160.27 - 7.0.300-preview.23160.27 - 7.0.300-preview.23160.27 + 7.0.300-preview.23162.2 + 7.0.300-preview.23162.2 + 7.0.300-preview.23162.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3b1da70249c9145dfb068774a1d56efeace0c9b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 06:37:22 +0000 Subject: [PATCH 525/864] Update dependencies from https://github.com/dotnet/sdk build 20230312.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23162.2 -> To Version 7.0.300-preview.23162.5 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23160-02 -> To Version 17.6.0-preview-23163-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 9538dda25..346e5019e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 - + https://github.com/dotnet/sdk - 00ceb88d5f5beb6f9bbf9bbcd5b5087665f88af7 + 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 20614d22a579d73f632d5d4c7449f1ff93a2ad81 + f776814442dc189b442ba87e3bdf1656c45dce81 diff --git a/eng/Versions.props b/eng/Versions.props index c19930873..75f54c574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23162.2 - 7.0.300-preview.23162.2 - 7.0.300-preview.23162.2 + 7.0.300-preview.23162.5 + 7.0.300-preview.23162.5 + 7.0.300-preview.23162.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 54578ddfd8ec47554db77642f2cbe55723f5c96f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 10:55:43 +0000 Subject: [PATCH 526/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23162.5 -> To Version 7.0.300-preview.23163.1 --- 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 346e5019e..3a64b902f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e - + https://github.com/dotnet/sdk - 13edb13c01ba78bb8c8b14b4141073b05d2c6bf1 + 584ea86b6a3318a428910d308a2b02971972a74e diff --git a/eng/Versions.props b/eng/Versions.props index 75f54c574..bb978ad5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23162.5 - 7.0.300-preview.23162.5 - 7.0.300-preview.23162.5 + 7.0.300-preview.23163.1 + 7.0.300-preview.23163.1 + 7.0.300-preview.23163.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d4db076b209d555e98e7db53cff6d16bb70c22de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 13 Mar 2023 14:44:42 +0100 Subject: [PATCH 527/864] Add VMR sync functionality into dotnet/dotnet's Codespaces (#15750) --- .devcontainer/vmr-source-build/README.md | 24 ++--- .devcontainer/vmr-source-build/init.sh | 25 +++-- .../vmr-source-build/synchronize-vmr.sh | 4 + eng/Version.Details.xml | 4 +- .../templates/steps/vmr-pull-updates.yml | 1 + eng/vmr-sync.sh | 93 +++++++++++-------- .../content/.devcontainer/README.md | 52 +++++++++++ .../content/.devcontainer/devcontainer.json | 8 +- src/SourceBuild/content/.devcontainer/init.sh | 14 +++ .../.devcontainer/prebuilt-sdk/build.sh | 11 --- .../prebuilt-sdk/devcontainer.json | 7 +- .../.devcontainer/prebuilt-sdk/init.sh | 9 ++ .../content/.devcontainer/synchronize-vmr.sh | 4 + src/SourceBuild/content/build.sh | 21 ++--- .../repo-projects/Directory.Build.props | 2 +- 15 files changed, 184 insertions(+), 95 deletions(-) create mode 100755 .devcontainer/vmr-source-build/synchronize-vmr.sh create mode 100644 src/SourceBuild/content/.devcontainer/README.md create mode 100644 src/SourceBuild/content/.devcontainer/init.sh delete mode 100755 src/SourceBuild/content/.devcontainer/prebuilt-sdk/build.sh create mode 100644 src/SourceBuild/content/.devcontainer/prebuilt-sdk/init.sh create mode 100644 src/SourceBuild/content/.devcontainer/synchronize-vmr.sh diff --git a/.devcontainer/vmr-source-build/README.md b/.devcontainer/vmr-source-build/README.md index 64cbd3dab..84e425bc2 100644 --- a/.devcontainer/vmr-source-build/README.md +++ b/.devcontainer/vmr-source-build/README.md @@ -12,14 +12,14 @@ This Codespace can help you debug the source build of .NET. In case you have run `dotnet/installer` PR branch, it will contain the VMR (`dotnet/dotnet`) checked out into `/workspaces/dotnet` with the PR changes pulled into it. You can then attempt to source-build the VMR which is what the VMR leg in the installer PR build doing. This build takes about 45 -minutes and, after completion, produces an archived .NET SDK in `/workspaces/artifacts/x64/Release`. +minutes and, after completion, produces an archived .NET SDK located in +`/workspaces/dotnet/artifacts/x64/Release`. ## Build the SDK To build the VMR, run following: ```bash cd /workspaces/dotnet -unset RepositoryName ./build.sh --online ``` @@ -37,22 +37,16 @@ When debugging the build, you have two options how to test your changes in this You can make the changes directly to the local checkout of the VMR at `/workspaces/dotnet`. You can then try to build the VMR and see if the change works for you. -### Pull changes into the local VMR +### Pull changes into the Codespace from your fork You can also make a fix in the individual source repository (e.g. `dotnet/runtime`) and push the -fix into a branch (can be in your fork too). Once you have the commit pushed, you can pull this -version of the repository into the VMR locally. +fix into a branch; can be in your fork too. Once you have the commit pushed, you can pull this +version of the repository into the Codespace by running: -Let's consider you pushed a commit with SHA `abcdef` into your fork at `github.com/yourfork/runtime`. -You can now bring this version of runtime into the local VMR in this Codespace by running: - -```bash -cd /workspaces/installer -./eng/vmr-sync.sh \ - --vmr /workspaces/dotnet \ - --tmp /workspaces/tmp \ - --repository runtime:abcdef \ - --remote runtime:https://github.com/yourfork/runtime +``` +/workspaces/synchronize-vmr.sh \ + --repository : \ + --remote : ``` You can now proceed building the VMR in the Codespace using instructions above. You can repeat diff --git a/.devcontainer/vmr-source-build/init.sh b/.devcontainer/vmr-source-build/init.sh index d50035a8f..fa074612a 100755 --- a/.devcontainer/vmr-source-build/init.sh +++ b/.devcontainer/vmr-source-build/init.sh @@ -10,6 +10,8 @@ workspace_dir=$(realpath "$installer_dir/../") tmp_dir=$(realpath "$workspace_dir/tmp") vmr_dir=$(realpath "$workspace_dir/dotnet") +cp "$installer_dir/.devcontainer/vmr-source-build/synchronize-vmr.sh" "$workspace_dir" + mkdir -p "$tmp_dir" # Codespaces performs a shallow fetch only @@ -18,21 +20,16 @@ git -C "$installer_dir" fetch --all --unshallow # We will try to figure out, which branch is the current (PR) branch based off of # We need this to figure out, which VMR branch to use vmr_branch=$(git -C "$installer_dir" log --pretty=format:'%D' HEAD^ \ - | grep 'origin/' \ - | head -n1 \ + | grep 'origin/' \ + | head -n1 \ | sed 's@origin/@@' \ | sed 's@,.*@@') -pushd "$installer_dir" - "./eng/vmr-sync.sh" \ - --vmr "$vmr_dir" \ - --tmp "$tmp_dir" \ - --branch "$vmr_branch" \ - --debug -popd +"$workspace_dir/synchronize-vmr.sh" \ + --repository "installer:$(git -C "$installer_dir" rev-parse HEAD)" \ + --recursive \ + --branch "$vmr_branch" \ + --remote "installer:$installer_dir" \ + --debug -# Run prep.sh -unset RepositoryName -pushd "$vmr_dir" -./prep.sh -popd +(cd "$vmr_dir" && ./prep.sh) diff --git a/.devcontainer/vmr-source-build/synchronize-vmr.sh b/.devcontainer/vmr-source-build/synchronize-vmr.sh new file mode 100755 index 000000000..274ca22ab --- /dev/null +++ b/.devcontainer/vmr-source-build/synchronize-vmr.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +(cd /workspaces/installer \ + && ./eng/vmr-sync.sh --vmr /workspaces/dotnet --tmp /workspaces/tmp $*) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d4969c58..8ea74570f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 7bf6cff81d0dd42b12f6d1a9b29f00607bfb47b4 + 57af468ca0fed21a073bd42d46fa6a2181fc7f18 diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 91244445b..5aaf290ae 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -35,6 +35,7 @@ steps: --branch ${{ parameters.vmrBranch }} --repository "installer:${{ parameters.targetRef }}" --recursive + --remote "installer:$(pwd)" --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --debug diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index c13041716..272af664c 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -14,45 +14,47 @@ ### folder to this to speed up your re-runs. ### ### USAGE: -### Synchronize the VMR to the commit of dotnet/installer that is currently being built: -### ./vmr-sync.sh --tmp-dir "$HOME/repos/tmp" -### ### Synchronize the VMR to a specific commit of dotnet/runtime using custom fork: ### ./vmr-sync.sh \ ### --repository runtime:e7e71da303af8dc97df99b098f21f526398c3943 \ -### --remote runtime:https://github.com/yourfork/runtime \ -### --tmp-dir "$HOME/repos/tmp"\ +### --remote runtime:https://github.com/yourfork/runtime \ +### --tmp-dir "$HOME/repos/tmp" ### ### Options: +### -r, --repository name:GIT_REF +### Required. Repository + git ref separated by colon to synchronize to. +### This can be a specific commit, branch, tag.. +### ### -t, --tmp, --tmp-dir PATH ### Required. Path to the temporary folder where repositories will be cloned -### --repository name:GIT_REF -### Optional. Repository + git ref separated by colon to synchronize to. -### This can be a specific commit, branch, tag.. -### When omitted, the script will synchronize the installer commit based on the version of the parent -### where this script is stored. -### -v, --vmr, --vmr-dir PATH -### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder +### ### -b, --branch, --vmr-branch BRANCH_NAME -### Optional. Branch of the 'dotnet/dotnet' repo to synchronize to -### This should match the target branch of the PR; defaults to 'main' -### --remote name:URI -### Optional. Additional remote to use during the synchronization -### This can be used to synchronize to a commit from a fork of the repository -### Example: 'runtime:https://github.com/yourfork/runtime' -### --recursive -### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) -### This is used when performing the full synchronization during installer's CI and the final VMR sync. -### Defaults to false unless no repository is supplied in which case a recursive sync of installer is performed. +### Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch +### +### --debug +### Optional. Turns on the most verbose logging for the VMR tooling +### ### --readme-template ### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of ### components. ### Defaults to src/VirtualMonoRepo/README.template.md +### +### --recursive +### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) +### This is used when performing the full synchronization during installer's CI and the final VMR sync. +### Defaults to false unless no repository is supplied in which case a recursive sync of installer is performed. +### +### --remote name:URI +### Optional. Additional remote to use during the synchronization +### This can be used to synchronize to a commit from a fork of the repository +### Example: 'runtime:https://github.com/yourfork/runtime' +### ### --tpn-template ### Optional. Template for the header of VMRs THIRD-PARTY-NOTICES file. ### Defaults to src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt -### --debug -### Optional. Turns on the most verbose logging for the VMR tooling +### +### -v, --vmr, --vmr-dir PATH +### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder source="${BASH_SOURCE[0]}" @@ -85,16 +87,22 @@ function highlight () { } installer_dir=$(realpath "$scriptroot/../") + tmp_dir='' vmr_dir='' -vmr_branch='main' +vmr_branch='' repository='' +additional_remotes='' recursive=false verbosity=verbose -additional_remotes="installer:$installer_dir" readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" +# If installer is a repo, we're in an installer and not in the dotnet/dotnet repo +if [[ -d "$installer_dir/.git" ]]; then + additional_remotes="installer:$installer_dir" +fi + while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in @@ -110,7 +118,7 @@ while [[ $# -gt 0 ]]; do vmr_branch=$2 shift ;; - --repository) + -r|--repository) repository=$2 shift ;; @@ -138,7 +146,7 @@ while [[ $# -gt 0 ]]; do ;; *) fail "Invalid argument: $1" - usage + print_help exit 1 ;; esac @@ -171,10 +179,8 @@ fi # Sanitize the input if [[ -z "$repository" ]]; then - current_sha=$(git -C "$installer_dir" rev-parse HEAD) - echo "No repository specified, will synchronize installer:$current_sha" - repository="installer:$current_sha" - recursive=true + fail "No repository to synchronize specified" + exit 1 fi if [[ -z "$vmr_dir" ]]; then @@ -194,16 +200,21 @@ fi if [[ ! -d "$vmr_dir" ]]; then highlight "Cloning 'dotnet/dotnet' into $vmr_dir.." git clone https://github.com/dotnet/dotnet "$vmr_dir" - git switch -c "$vmr_branch" + + if [[ -n "$vmr_branch" ]]; then + git -C "$vmr_dir" switch -c "$vmr_branch" + fi else if ! git -C "$vmr_dir" diff --quiet; then fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes" exit 1 fi - highlight "Preparing $vmr_dir" - git -C "$vmr_dir" checkout "$vmr_branch" - git -C "$vmr_dir" pull + if [[ -n "$vmr_branch" ]]; then + highlight "Preparing $vmr_dir" + git -C "$vmr_dir" checkout "$vmr_branch" + git -C "$vmr_dir" pull + fi fi set -e @@ -213,10 +224,10 @@ set -e highlight 'Installing .NET, preparing the tooling..' source "$scriptroot/common/tools.sh" InitializeDotNetCli true -dotnet="$scriptroot/../.dotnet/dotnet" +dotnet=$(realpath "$scriptroot/../.dotnet/dotnet") "$dotnet" tool restore -highlight "Starting the synchronization to '$repository'.." +highlight "Starting the synchronization of '$repository'.." set +e recursive_arg='' @@ -224,6 +235,10 @@ if [[ "$recursive" == "true" ]]; then recursive_arg="--recursive" fi +if [[ -n "$additional_remotes" ]]; then + additional_remotes="--additional-remotes $additional_remotes" +fi + # Synchronize the VMR "$dotnet" darc vmr update \ @@ -233,7 +248,7 @@ fi $recursive_arg \ --readme-template "$readme_template" \ --tpn-template "$tpn_template" \ - --additional-remotes "$additional_remotes" \ + $additional_remotes \ "$repository" if [[ $? == 0 ]]; then diff --git a/src/SourceBuild/content/.devcontainer/README.md b/src/SourceBuild/content/.devcontainer/README.md new file mode 100644 index 000000000..5b548e497 --- /dev/null +++ b/src/SourceBuild/content/.devcontainer/README.md @@ -0,0 +1,52 @@ + + +This Codespace can help you debug the source build of .NET. This build takes about +45 minutes and, after completion, produces an archived .NET SDK located in +`/workspaces/dotnet/artifacts/x64/Release`. In case you selected the `prebuilt-sdk` +Codespace, the SDK will already be there. + +## Build the SDK + +To build the VMR, run following: +```bash +./prep.sh && ./build.sh --online +``` + +> Please note that, at this time, the build modifies some of the checked-in sources so it might +be preferential to rebuild the Codespace between attempts (or reset the working tree changes). + +For more details, see the instructions at https://github.com/dotnet/dotnet. + +## Synchronize your changes in locally + +When debugging the build, you have two options how to test your changes in this environment. + +### Making changes to the VMR directly + +You can make the changes directly to the local checkout of the VMR at `/workspaces/dotnet`. You +can then try to build the VMR and see if the change works for you. + +### Pull changes into the Codespace from your fork + +You can also make a fix in the individual source repository (e.g. `dotnet/runtime`) and push the +fix into a branch; can be in your fork too. Once you have the commit pushed, you can pull this +version of the repository into the Codespace by running: + +``` +/workspaces/synchronize-vmr.sh \ + --repository : \ + --remote : +``` + +You can now proceed building the VMR in the Codespace using instructions above. You can repeat +this process and sync a new commit from your fork. Only note that, at this time, Source-Build +modifies some of the checked-in sources so you'll need to revert the working tree changes +between attempts. diff --git a/src/SourceBuild/content/.devcontainer/devcontainer.json b/src/SourceBuild/content/.devcontainer/devcontainer.json index c5bef51ea..6061a0eff 100644 --- a/src/SourceBuild/content/.devcontainer/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/devcontainer.json @@ -11,6 +11,12 @@ "extensions": [ "ms-dotnettools.csharp" ] + }, + "codespaces": { + "openFiles": [ + ".devcontainer/README.md" + ] } - } + }, + "onCreateCommand": ".devcontainer/init.sh" } \ No newline at end of file diff --git a/src/SourceBuild/content/.devcontainer/init.sh b/src/SourceBuild/content/.devcontainer/init.sh new file mode 100644 index 000000000..9fa9e81f7 --- /dev/null +++ b/src/SourceBuild/content/.devcontainer/init.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -eux + +source="${BASH_SOURCE[0]}" +script_root="$( cd -P "$( dirname "$source" )" && pwd )" + +workspace_dir=$(realpath "$script_root/../../") +tmp_dir=$(realpath "$workspace_dir/tmp") +vmr_dir=$(realpath "$workspace_dir/dotnet") + +cp "$vmr_dir/.devcontainer/synchronize-vmr.sh" "$workspace_dir" + +mkdir -p "$tmp_dir" diff --git a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/build.sh b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/build.sh deleted file mode 100755 index 528cb695a..000000000 --- a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -"$scriptroot"/../../prep.sh - -# GitHub Codespaces sets this and it conflicts with source-build scripts. -unset RepositoryName - -"$scriptroot"/../../build.sh --online --clean-while-building || exit 0 diff --git a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json index 6e8a61e06..eaff85ffd 100644 --- a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json @@ -11,7 +11,12 @@ "extensions": [ "ms-dotnettools.csharp" ] + }, + "codespaces": { + "openFiles": [ + ".devcontainer/README.md" + ] } }, - "onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/prebuilt-sdk/build.sh" + "onCreateCommand": ".devcontainer/prebuilt-sdk/init.sh" } \ No newline at end of file diff --git a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/init.sh b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/init.sh new file mode 100644 index 000000000..6ba00c46a --- /dev/null +++ b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/init.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +script_root="$( cd -P "$( dirname "$source" )" && pwd )" + +"$script_root"/../../prep.sh + +cp "$script_root/../synchronize-vmr.sh" "/workspaces/" +"$script_root"/../../build.sh --online --clean-while-building || exit 0 diff --git a/src/SourceBuild/content/.devcontainer/synchronize-vmr.sh b/src/SourceBuild/content/.devcontainer/synchronize-vmr.sh new file mode 100644 index 000000000..6d676b1c9 --- /dev/null +++ b/src/SourceBuild/content/.devcontainer/synchronize-vmr.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +(cd /workspaces/dotnet/src/installer \ + && ./eng/vmr-sync.sh --vmr /workspaces/dotnet --tmp /workspaces/tmp --no-vmr-prepare $*) diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index e61ce1b25..6fdf14c10 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -19,7 +19,6 @@ usage() { SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" MSBUILD_ARGUMENTS=("-flp:v=detailed") -CUSTOM_REF_PACKAGES_DIR='' CUSTOM_PACKAGES_DIR='' alternateTarget=false runningSmokeTests=false @@ -34,7 +33,7 @@ while :; do break fi - lowerI="$(echo $1 | awk '{print tolower($0)}')" + lowerI="$(echo "$1" | awk '{print tolower($0)}')" case $lowerI in --clean-while-building) MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true") @@ -78,7 +77,7 @@ while :; do echo "Detected '--': passing remaining parameters '$@' as build.sh arguments." break ;; - -?|-h|--help) + '-?'|-h|--help) usage exit 0 ;; @@ -115,13 +114,13 @@ if [ -f "${packagesArchiveDir}archiveArtifacts.txt" ]; then fi if [ -d "$CUSTOM_SDK_DIR" ]; then - export SDK_VERSION=`"$CUSTOM_SDK_DIR/dotnet" --version` + export SDK_VERSION=$("$CUSTOM_SDK_DIR/dotnet" --version) export CLI_ROOT="$CUSTOM_SDK_DIR" export _InitializeDotNetCli="$CLI_ROOT/dotnet" export CustomDotNetSdkDir="$CLI_ROOT" echo "Using custom bootstrap SDK from '$CLI_ROOT', version '$SDK_VERSION'" else - sdkLine=`grep -m 1 'dotnet' "$SCRIPT_ROOT/global.json"` + sdkLine=$(grep -m 1 'dotnet' "$SCRIPT_ROOT/global.json") sdkPattern="\"dotnet\" *: *\"(.*)\"" if [[ $sdkLine =~ $sdkPattern ]]; then export SDK_VERSION=${BASH_REMATCH[1]} @@ -134,7 +133,7 @@ packageVersionsPath='' if [[ "$CUSTOM_PACKAGES_DIR" != "" && -f "$CUSTOM_PACKAGES_DIR/PackageVersions.props" ]]; then packageVersionsPath="$CUSTOM_PACKAGES_DIR/PackageVersions.props" elif [ -d "$packagesArchiveDir" ]; then - sourceBuiltArchive=`find $packagesArchiveDir -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` + sourceBuiltArchive=$(find "$packagesArchiveDir" -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz') if [ -f "${packagesPreviouslySourceBuiltDir}}PackageVersions.props" ]; then packageVersionsPath=${packagesPreviouslySourceBuiltDir}PackageVersions.props elif [ -f "$sourceBuiltArchive" ]; then @@ -150,7 +149,7 @@ if [ ! -f "$packageVersionsPath" ]; then exit 1 fi -arcadeSdkLine=`grep -m 1 'MicrosoftDotNetArcadeSdkVersion' "$packageVersionsPath"` +arcadeSdkLine=$(grep -m 1 'MicrosoftDotNetArcadeSdkVersion' "$packageVersionsPath") versionPattern="(.*)" if [[ $arcadeSdkLine =~ $versionPattern ]]; then export ARCADE_BOOTSTRAP_VERSION=${BASH_REMATCH[1]} @@ -163,7 +162,7 @@ if [[ $arcadeSdkLine =~ $versionPattern ]]; then export SOURCE_BUILT_SDK_DIR_ARCADE=$packagesRestoredDir/ArcadeBootstrapPackage/microsoft.dotnet.arcade.sdk/$ARCADE_BOOTSTRAP_VERSION fi -sourceLinkLine=`grep -m 1 'MicrosoftSourceLinkCommonVersion' "$packageVersionsPath"` +sourceLinkLine=$(grep -m 1 'MicrosoftSourceLinkCommonVersion' "$packageVersionsPath") versionPattern="(.*)" if [[ $sourceLinkLine =~ $versionPattern ]]; then export SOURCE_LINK_BOOTSTRAP_VERSION=${BASH_REMATCH[1]} @@ -179,11 +178,11 @@ LogDateStamp=$(date +"%m%d%H%M%S") "$CLI_ROOT/dotnet" build-server shutdown if [ "$alternateTarget" == "true" ]; then - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog -flp:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog -flp:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver "$CLI_ROOT/dotnet" build-server shutdown - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog -flp:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log ${MSBUILD_ARGUMENTS[@]} "$@" + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log" ${MSBUILD_ARGUMENTS[@]} "$@" fi diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index a9546d9bc..4e1de0d90 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -1,7 +1,7 @@ - $(MSBuildProjectName) + $(MSBuildProjectName) From f6ba6dd7694496aff2461cbfd38dad0e31b658e9 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 13 Mar 2023 10:43:21 -0500 Subject: [PATCH 528/864] Update SB prebuilts tarball version (#15773) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 049760016..7499b5851 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-8.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-11.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz From 0618b2c20d311cb615f5a4b2857dd15376ba09d4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 13 Mar 2023 14:02:57 -0700 Subject: [PATCH 529/864] Automate asp.net template updates into dotnet/installer --- eng/Versions.props | 28 +++++++++++++++++-- .../targets/GenerateBundledVersions.targets | 7 ----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 45673d3d7..fed6eec12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,6 +19,12 @@ true release + + 30 + 32 + 17 + $([MSBuild]::Add($(VersionFeature), 13)) + @@ -103,12 +109,28 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) + + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + 5.0.403 6.0.302 - 5.0.13 - 6.0.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -135,7 +157,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index fc64d3a14..60d7ecde1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -59,13 +59,6 @@ - - 30 - 32 - 17 - $([MSBuild]::Add($(VersionFeature), 13)) - - Microsoft.NETCoreSdk.BundledVersions.props From 67e4bf2cf09f349693e606fcc1293bdbfde576f3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 13 Mar 2023 14:07:05 -0700 Subject: [PATCH 530/864] Automate asp.net template updates into dotnet/installer --- eng/Versions.props | 28 +++++++++++++++++-- .../targets/GenerateBundledVersions.targets | 7 ----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 75f54c574..3f7f42255 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,6 +19,12 @@ false release + + 30 + 32 + 17 + 14 + @@ -103,12 +109,28 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) + + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + 5.0.403 6.0.302 - 5.0.13 - 6.0.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -135,7 +157,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 3bdff216f..60d7ecde1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -59,13 +59,6 @@ - - 30 - 32 - 17 - 14 - - Microsoft.NETCoreSdk.BundledVersions.props From 7318e092d00ea05698f31c0203968508b37a9045 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 13 Mar 2023 14:11:48 -0700 Subject: [PATCH 531/864] Automate template updates into dotnet/installer --- eng/Versions.props | 31 +++++++++++++++++-- .../targets/GenerateBundledVersions.targets | 8 ----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 47542d68d..0a1ed9816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,6 +18,13 @@ false release + + 30 + 32 + 17 + 14 + 2 + @@ -111,6 +118,26 @@ 5.8.0 + + + + $(MicrosoftNETSdkPackageVersion.Split('.')[2]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) + $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) + + true + true + $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature70), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) + $([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1)) + 5.0.403 @@ -147,14 +174,14 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates70PackageVersion) $(MicrosoftDotNetCommonItemTemplates70PackageVersion) - 7.0.3 + 7.0.$(AspNetCoreTemplateFeature70) $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.14 + 6.0.$(AspNetCoreTemplateFeature60) $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 687af9365..f9f381b7f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -66,14 +66,6 @@ - - 30 - 32 - 17 - 14 - 2 - - Microsoft.NETCoreSdk.BundledVersions.props From d45d7732713c167bee244982cb4c7c31e93c23aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 21:50:00 +0000 Subject: [PATCH 532/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23159.20 -> To Version 8.0.100-preview.3.23163.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23157.3 -> To Version 8.0.0-preview.3.23160.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 46 ++++++++-------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ea74570f..fd71cb48d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 100e9b111742e2499c70782dd656c30706491a30 + 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/windowsdesktop - 100e9b111742e2499c70782dd656c30706491a30 + 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/windowsdesktop - 100e9b111742e2499c70782dd656c30706491a30 + 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/windowsdesktop - 100e9b111742e2499c70782dd656c30706491a30 + 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db - + https://github.com/dotnet/aspnetcore - 5b70808e0b6aba16359287629349c3267111f8ae + ccb861b89f62c445f175f6a3ca2142f93e7ce5db https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - f403c010ac568828c62ee6497ecfb38696e26b12 + 93ed107ce82ecc32db9a222773dfab0ab6e89d0a - + https://github.com/dotnet/sdk - f403c010ac568828c62ee6497ecfb38696e26b12 + 93ed107ce82ecc32db9a222773dfab0ab6e89d0a - + https://github.com/dotnet/sdk - f403c010ac568828c62ee6497ecfb38696e26b12 + 93ed107ce82ecc32db9a222773dfab0ab6e89d0a - + https://github.com/dotnet/sdk - f403c010ac568828c62ee6497ecfb38696e26b12 + 93ed107ce82ecc32db9a222773dfab0ab6e89d0a - + https://github.com/dotnet/winforms - 41b11b6a7290a2bbc0c293042f30d9632e55aae2 + cdef38a8c587ed438465456f5843f4204001c127 - + https://github.com/dotnet/wpf - a9894d8820de6e620f3919f2bb2eda46c682e823 + a5a00f37f05be7a71f7af1bbca6edc3000921d8f - + https://github.com/dotnet/fsharp - 225eaa6ddb994e7c74c7eac1e301f688366f1b78 + 50ede7324c833488ee6769b18662d0e7be31c862 - + https://github.com/dotnet/fsharp - 225eaa6ddb994e7c74c7eac1e301f688366f1b78 + 50ede7324c833488ee6769b18662d0e7be31c862 @@ -142,23 +142,23 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - a92ed6e2ce778c8b18dfa66f8f75368eca901f99 + c887c92d8af4ce65b19962b777f96ae8eb997a42 https://github.com/dotnet/roslyn 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - a0c282787d59ca9a449ded85175f39030e5077b8 + 20614d22a579d73f632d5d4c7449f1ff93a2ad81 - + https://github.com/nuget/nuget.client - f49ca00e27297fe7b4b82a2557d5b0caad907a06 + 3ab7d1462029e0b211a88040c952c9b8a679708d diff --git a/eng/Versions.props b/eng/Versions.props index 47542d68d..a46a50c0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-preview.3.23156.2 + 8.0.0-preview.3.23159.2 - 8.0.0-preview.3.23157.1 + 8.0.0-preview.3.23160.1 @@ -58,46 +58,46 @@ - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 - 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23160.17 0.2.0 - 8.0.100-preview.3.23159.20 - 8.0.100-preview.3.23159.20 - 8.0.100-preview.3.23159.20 + 8.0.100-preview.3.23163.2 + 8.0.100-preview.3.23163.2 + 8.0.100-preview.3.23163.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23160.6 - 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.4 - 8.0.0-preview.3.23159.4 + 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23160.6 2.1.0 - 8.0.0-preview.3.23157.3 - 8.0.0-preview.3.23157.3 - 8.0.0-preview.3.23157.3 - 8.0.0-preview.3.23157.3 + 8.0.0-preview.3.23160.3 + 8.0.0-preview.3.23160.3 + 8.0.0-preview.3.23160.3 + 8.0.0-preview.3.23160.3 From d111097eccae8a77df40b5dd8e93b116f3c7508e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Mar 2023 23:46:09 +0000 Subject: [PATCH 533/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23159.20 -> To Version 8.0.100-preview.3.23163.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23157.3 -> To Version 8.0.0-preview.3.23160.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd71cb48d..f5a3e0551 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f - + https://github.com/dotnet/aspnetcore - ccb861b89f62c445f175f6a3ca2142f93e7ce5db + 07937702255861896d9ec34e28c7c0c59ceb6a3f https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 93ed107ce82ecc32db9a222773dfab0ab6e89d0a + 0e9ba20184689a18972aa755edf522ee5c7fa9c8 - + https://github.com/dotnet/sdk - 93ed107ce82ecc32db9a222773dfab0ab6e89d0a + 0e9ba20184689a18972aa755edf522ee5c7fa9c8 - + https://github.com/dotnet/sdk - 93ed107ce82ecc32db9a222773dfab0ab6e89d0a + 0e9ba20184689a18972aa755edf522ee5c7fa9c8 - + https://github.com/dotnet/sdk - 93ed107ce82ecc32db9a222773dfab0ab6e89d0a + 0e9ba20184689a18972aa755edf522ee5c7fa9c8 @@ -151,14 +151,14 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 20614d22a579d73f632d5d4c7449f1ff93a2ad81 + f776814442dc189b442ba87e3bdf1656c45dce81 - + https://github.com/nuget/nuget.client - 3ab7d1462029e0b211a88040c952c9b8a679708d + fdc39cc7f7541056c638ea982dc179f554849b7d diff --git a/eng/Versions.props b/eng/Versions.props index a46a50c0b..0316616ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23160.17 - 8.0.0-preview.3.23160.17 - 8.0.0-preview.3.23160.17 - 8.0.0-preview.3.23160.17 - 8.0.0-preview.3.23160.17 - 8.0.0-preview.3.23160.17 - 8.0.0-preview.3.23160.17 + 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.7 0.2.0 - 8.0.100-preview.3.23163.2 - 8.0.100-preview.3.23163.2 - 8.0.100-preview.3.23163.2 + 8.0.100-preview.3.23163.5 + 8.0.100-preview.3.23163.5 + 8.0.100-preview.3.23163.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c98763de28aa805cec65af49f38c1309bc85b539 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 00:45:13 +0000 Subject: [PATCH 534/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23162.5 -> To Version 7.0.300-preview.23163.6 --- 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 3a64b902f..82903eb38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a - + https://github.com/dotnet/sdk - 584ea86b6a3318a428910d308a2b02971972a74e + 6544593237fcc6c4f0ebb88121d2d7c6d631679a diff --git a/eng/Versions.props b/eng/Versions.props index bb978ad5f..3e181bc58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.1 - 7.0.300-preview.23163.1 - 7.0.300-preview.23163.1 + 7.0.300-preview.23163.6 + 7.0.300-preview.23163.6 + 7.0.300-preview.23163.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a282faad9de2af44ffaf17af92db68fbdf1bada Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 01:00:46 +0000 Subject: [PATCH 535/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23159.20 -> To Version 8.0.100-preview.3.23163.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23157.3 -> To Version 8.0.0-preview.3.23160.3 (parent: Microsoft.NET.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 f5a3e0551..43da2b0af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 0e9ba20184689a18972aa755edf522ee5c7fa9c8 + e1b15e8605551818647088846f00c253b044c1a2 - + https://github.com/dotnet/sdk - 0e9ba20184689a18972aa755edf522ee5c7fa9c8 + e1b15e8605551818647088846f00c253b044c1a2 - + https://github.com/dotnet/sdk - 0e9ba20184689a18972aa755edf522ee5c7fa9c8 + e1b15e8605551818647088846f00c253b044c1a2 - + https://github.com/dotnet/sdk - 0e9ba20184689a18972aa755edf522ee5c7fa9c8 + e1b15e8605551818647088846f00c253b044c1a2 diff --git a/eng/Versions.props b/eng/Versions.props index 0316616ad..4e975aceb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23163.5 - 8.0.100-preview.3.23163.5 - 8.0.100-preview.3.23163.5 + 8.0.100-preview.3.23163.7 + 8.0.100-preview.3.23163.7 + 8.0.100-preview.3.23163.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b590fca0997902c5a0341bed3d91aac4c259fb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 02:46:50 +0000 Subject: [PATCH 536/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23163.7 -> To Version 8.0.100-preview.3.23163.8 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.3.23163.7 -> To Version 8.0.0-preview.3.23163.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43da2b0af..5f12871d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime c887c92d8af4ce65b19962b777f96ae8eb997a42 - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c - + https://github.com/dotnet/aspnetcore - 07937702255861896d9ec34e28c7c0c59ceb6a3f + 09e9ed7edbbaf6f43cb083d633908b4459a90d8c https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - e1b15e8605551818647088846f00c253b044c1a2 + c4b63ef4adf7b870240dece56303fa6444c45690 - + https://github.com/dotnet/sdk - e1b15e8605551818647088846f00c253b044c1a2 + c4b63ef4adf7b870240dece56303fa6444c45690 - + https://github.com/dotnet/sdk - e1b15e8605551818647088846f00c253b044c1a2 + c4b63ef4adf7b870240dece56303fa6444c45690 - + https://github.com/dotnet/sdk - e1b15e8605551818647088846f00c253b044c1a2 + c4b63ef4adf7b870240dece56303fa6444c45690 diff --git a/eng/Versions.props b/eng/Versions.props index 4e975aceb..9f436a313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23163.7 - 8.0.0-preview.3.23163.7 - 8.0.0-preview.3.23163.7 - 8.0.0-preview.3.23163.7 - 8.0.0-preview.3.23163.7 - 8.0.0-preview.3.23163.7 - 8.0.0-preview.3.23163.7 + 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23163.11 0.2.0 - 8.0.100-preview.3.23163.7 - 8.0.100-preview.3.23163.7 - 8.0.100-preview.3.23163.7 + 8.0.100-preview.3.23163.8 + 8.0.100-preview.3.23163.8 + 8.0.100-preview.3.23163.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c7fe015de014d9f43a4b9164bd57f2a6ac8f78a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 03:07:21 +0000 Subject: [PATCH 537/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.6 -> To Version 7.0.300-preview.23163.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23161.1 -> To Version 12.5.0-beta.23163.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82903eb38..5b32f57fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 - + https://github.com/dotnet/sdk - 6544593237fcc6c4f0ebb88121d2d7c6d631679a + 2e8a920151b67aa331be0ea0bebb87068be750d4 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 50ede7324c833488ee6769b18662d0e7be31c862 + c941623cc85b3598448e80b31a0a01241848610f - + https://github.com/dotnet/fsharp - 50ede7324c833488ee6769b18662d0e7be31c862 + c941623cc85b3598448e80b31a0a01241848610f @@ -149,14 +149,14 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - f776814442dc189b442ba87e3bdf1656c45dce81 + 7dc4565a1bb9667fab53d82c8fbb53e832f3f009 - + https://github.com/nuget/nuget.client - 3ab7d1462029e0b211a88040c952c9b8a679708d + fdc39cc7f7541056c638ea982dc179f554849b7d diff --git a/eng/Versions.props b/eng/Versions.props index 3e181bc58..069ca6b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.6 - 7.0.300-preview.23163.6 - 7.0.300-preview.23163.6 + 7.0.300-preview.23163.9 + 7.0.300-preview.23163.9 + 7.0.300-preview.23163.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 160706ef9faa16ee80a37fd9ebb73f43bbd7fb53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 03:46:42 +0000 Subject: [PATCH 538/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23163.7 -> To Version 8.0.100-preview.3.23163.10 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23160.6 -> To Version 8.0.0-preview.3.23163.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++--------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f12871d5..237df7250 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c4b63ef4adf7b870240dece56303fa6444c45690 + 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 - + https://github.com/dotnet/sdk - c4b63ef4adf7b870240dece56303fa6444c45690 + 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 - + https://github.com/dotnet/sdk - c4b63ef4adf7b870240dece56303fa6444c45690 + 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 - + https://github.com/dotnet/sdk - c4b63ef4adf7b870240dece56303fa6444c45690 + 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - c887c92d8af4ce65b19962b777f96ae8eb997a42 + e247ef3c03f5dae7ed634d83ec53e1386e5fe57d https://github.com/dotnet/roslyn @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b211c38c398416b516ffab1806b8ba47d49c42da + 352d64e0ce9b99a8cff6207621432a986920ffd9 diff --git a/eng/Versions.props b/eng/Versions.props index 9f436a313..2648929e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23163.8 - 8.0.100-preview.3.23163.8 - 8.0.100-preview.3.23163.8 + 8.0.100-preview.3.23163.10 + 8.0.100-preview.3.23163.10 + 8.0.100-preview.3.23163.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23163.5 - 8.0.0-preview.3.23160.6 - 8.0.0-preview.3.23160.6 - 8.0.0-preview.3.23160.6 - 8.0.0-preview.3.23160.6 - 8.0.0-preview.3.23160.6 - 8.0.0-preview.3.23160.6 + 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.5 2.1.0 @@ -200,7 +200,7 @@ 13.1.227-net8-p1 16.1.1015-net8-p1 - 8.0.0-preview.3.23159.3 + 8.0.0-preview.3.23160.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 0c2053ec5ed8eb6491d6cab1c601ef834a212941 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 06:35:08 +0000 Subject: [PATCH 539/864] Update dependencies from https://github.com/dotnet/sdk build 20230313.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.9 -> To Version 7.0.300-preview.23163.13 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23163-06 -> To Version 17.6.0-preview-23164-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 5b32f57fa..1a8c28f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb - + https://github.com/dotnet/sdk - 2e8a920151b67aa331be0ea0bebb87068be750d4 + 042cb86c525c673e69564d2067e6a71816eb4cdb @@ -149,9 +149,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - 7dc4565a1bb9667fab53d82c8fbb53e832f3f009 + 18fe510422c6cf65533add0c82b9d4d190e5df28 diff --git a/eng/Versions.props b/eng/Versions.props index 069ca6b5d..44a7548fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.9 - 7.0.300-preview.23163.9 - 7.0.300-preview.23163.9 + 7.0.300-preview.23163.13 + 7.0.300-preview.23163.13 + 7.0.300-preview.23163.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0f6dbf247d82136009d9113393f4c6b51d4fb712 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 07:44:05 +0000 Subject: [PATCH 540/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23163.10 -> To Version 8.0.100-preview.3.23164.1 --- 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 237df7250..0558cd17b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 + d8823a36ac8b965ac59e1441fa37b9120b64a201 - + https://github.com/dotnet/sdk - 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 + d8823a36ac8b965ac59e1441fa37b9120b64a201 - + https://github.com/dotnet/sdk - 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 + d8823a36ac8b965ac59e1441fa37b9120b64a201 - + https://github.com/dotnet/sdk - 3f4fd12815b4e6c4a1ec1a9a79fa3da525533fe9 + d8823a36ac8b965ac59e1441fa37b9120b64a201 diff --git a/eng/Versions.props b/eng/Versions.props index 2648929e1..ce6aea6cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23163.10 - 8.0.100-preview.3.23163.10 - 8.0.100-preview.3.23163.10 + 8.0.100-preview.3.23164.1 + 8.0.100-preview.3.23164.1 + 8.0.100-preview.3.23164.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb2f4dc0df549cda1b90a915e44098b7b8403ead Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 08:28:02 +0000 Subject: [PATCH 541/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23163.13 -> To Version 7.0.300-preview.23164.2 --- 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 1a8c28f92..4e823806a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a - + https://github.com/dotnet/sdk - 042cb86c525c673e69564d2067e6a71816eb4cdb + 081249fc2d499c2d3acd105d2d79696db742024a diff --git a/eng/Versions.props b/eng/Versions.props index 44a7548fa..a6d042519 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23163.13 - 7.0.300-preview.23163.13 - 7.0.300-preview.23163.13 + 7.0.300-preview.23164.2 + 7.0.300-preview.23164.2 + 7.0.300-preview.23164.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c85a6738fa8007ce5c73a98fd5de1cad71b23093 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 08:46:43 +0000 Subject: [PATCH 542/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23163.10 -> To Version 8.0.100-preview.3.23164.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23163.5 -> To Version 8.0.0-preview.3.23163.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0558cd17b..9fa7ca039 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - d8823a36ac8b965ac59e1441fa37b9120b64a201 + 6692fa1c9b067ce600df9ad504a0a10d56975339 - + https://github.com/dotnet/sdk - d8823a36ac8b965ac59e1441fa37b9120b64a201 + 6692fa1c9b067ce600df9ad504a0a10d56975339 - + https://github.com/dotnet/sdk - d8823a36ac8b965ac59e1441fa37b9120b64a201 + 6692fa1c9b067ce600df9ad504a0a10d56975339 - + https://github.com/dotnet/sdk - d8823a36ac8b965ac59e1441fa37b9120b64a201 + 6692fa1c9b067ce600df9ad504a0a10d56975339 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - e247ef3c03f5dae7ed634d83ec53e1386e5fe57d + 648d477858b5723059085de84966a2247cfdc0e7 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ce6aea6cc..cbc60abd1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23164.1 - 8.0.100-preview.3.23164.1 - 8.0.100-preview.3.23164.1 + 8.0.100-preview.3.23164.3 + 8.0.100-preview.3.23164.3 + 8.0.100-preview.3.23164.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.12 - 8.0.0-preview.3.23163.5 - 8.0.0-preview.3.23163.5 - 8.0.0-preview.3.23163.5 - 8.0.0-preview.3.23163.5 - 8.0.0-preview.3.23163.5 - 8.0.0-preview.3.23163.5 + 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23163.12 2.1.0 From b672d917899a132aab3ae7bf09ad82e97cbbc796 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Tue, 14 Mar 2023 14:03:24 +0100 Subject: [PATCH 543/864] DotNetHelper: fix IsMonoRuntime being initialized before extracting the sdk. (#15646) --- .../DotNetHelper.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index ff1071e2e..80ff2e29e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -14,13 +14,13 @@ internal class DotNetHelper { private static readonly object s_lockObj = new(); - private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime(); public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet"); public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages"); public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}"); private ITestOutputHelper OutputHelper { get; } + private bool IsMonoRuntime { get; } public DotNetHelper(ITestOutputHelper outputHelper) { @@ -38,6 +38,7 @@ internal class DotNetHelper Directory.CreateDirectory(Config.DotNetDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper); } + IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory); if (!Directory.Exists(ProjectsDirectory)) { @@ -234,10 +235,8 @@ internal class DotNetHelper return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}"; } - private static bool DetermineIsMonoRuntime() + private static bool DetermineIsMonoRuntime(string dotnetRoot) { - string dotnetRoot = Config.DotNetDirectory; - string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App"); if (!Directory.Exists(sharedFrameworkRoot)) { From d625015437c1e2809a02504164b870d063cca663 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 14 Mar 2023 11:17:21 -0500 Subject: [PATCH 544/864] Enable bootstrap flow testing in CI (#15774) --- eng/pipelines/templates/jobs/vmr-build.yml | 25 +++++++++++------ src/SourceBuild/content/prep.sh | 32 +++++++++++++++++----- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index dfc40c73a..77be79eb2 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -53,6 +53,7 @@ parameters: type: boolean default: false +# Use the previous version's SDK to build the current one - name: withPreviousSDK type: boolean default: false @@ -160,22 +161,28 @@ jobs: - script: | set -x - if [[ -z '${{ parameters.reuseBuildArtifactsFrom }}' && '${{ parameters.withPreviousSDK }}' != 'True' ]]; then - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh - else + customPrepArgs="" + prepSdk=true + if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then + # Source-built artifacts are from CentOS 8 Stream. We want to download them without + # downloading portable versions from the internet. + customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap" + prepSdk=false + elif [[ -n '${{ parameters.reuseBuildArtifactsFrom }}' ]]; then + customPrepArgs="${customPrepArgs} --no-sdk --no-artifacts" + prepSdk=false + fi + + if [[ "$prepSdk" == "false" ]]; then mkdir $(sourcesPath)/.dotnet previousSdkPath="$(sourcesPath)/prereqs/packages/archive/dotnet-sdk-*.tar.gz" eval tar -ozxf "$previousSdkPath" -C "$(sourcesPath)/.dotnet" eval rm -f "$previousSdkPath" - if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then - # Source-built artifacts are from CentOS 8 Stream. We want to download them without - # downloading portable versions from the internet. - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh --no-bootstrap - fi - echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet" fi + + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh ${customPrepArgs} displayName: Prep the Build - script: | diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index ba5415671..7149f2e3a 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -10,11 +10,17 @@ usage() { echo " Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and" echo " installing the version of dotnet referenced in global.json" echo "options:" - echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" + echo " --no-artifacts Exclude the download of the previously source-built artifacts archive." + echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" + echo " --no-prebuilts Exclude the download of the prebuilts archive." + echo " --no-sdk Exclude the download of the .NET SDK." echo "" } buildBootstrap=true +downloadArtifacts=true +downloadPrebuilts=true +installDotnet=true positional_args=() while :; do if [ $# -le 0 ]; then @@ -29,6 +35,15 @@ while :; do --no-bootstrap) buildBootstrap=false ;; + --no-artifacts) + downloadArtifacts=false + ;; + --no-prebuilts) + downloadPrebuilts=false + ;; + --no-sdk) + installDotnet=false + ;; *) positional_args+=("$1") ;; @@ -37,9 +52,12 @@ while :; do shift done -downloadArtifacts=true -downloadPrebuilts=true -installDotnet=true +# Attempting to bootstrap without an SDK will fail. So either the --no-sdk flag must be passed +# or a pre-existing .dotnet SDK directory must exist. +if [[ "$buildBootstrap" == "true" && "$installDotnet" == "false" && ! -d $SCRIPT_ROOT/.dotnet ]]; then + echo " ERROR: --no-sdk requires --no-bootstrap or a pre-existing .dotnet SDK directory. Exiting..." + exit -1 +fi # Check to make sure curl exists to download the archive files if ! command -v curl &> /dev/null @@ -51,20 +69,20 @@ fi # Check if Private.SourceBuilt artifacts archive exists artifactsBaseFileName="Private.SourceBuilt.Artifacts" packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/" -if [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then +if [[ "$downloadArtifacts" == "true" && -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]]; then echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" downloadArtifacts=false fi # Check if Private.SourceBuilt prebuilts archive exists prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts" -if [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then +if [[ "$downloadPrebuilts" == "true" && -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]]; then echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded" downloadPrebuilts=false fi # Check if dotnet is installed -if [ -d $SCRIPT_ROOT/.dotnet ]; then +if [[ "$installDotnet" == "true" && -d $SCRIPT_ROOT/.dotnet ]]; then echo " ./.dotnet SDK directory exists...it will not be installed" installDotnet=false; fi From f18eda4950c7b882b756e2dc78907b80fe75e1f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:46:46 +0000 Subject: [PATCH 545/864] [main] Update dependencies from dotnet/arcade (#15787) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fa7ca039..c66f263d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + a0a9c59876ae267d27d64c9b157337681208c1bc - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + a0a9c59876ae267d27d64c9b157337681208c1bc - + https://github.com/dotnet/arcade - e4e5e16cf38c950ed835f8b223ebfdeca3e112aa + a0a9c59876ae267d27d64c9b157337681208c1bc https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index cbc60abd1..4b8c4cb35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23156.4 + 8.0.0-beta.23163.1 diff --git a/global.json b/global.json index c5e037bc0..3d281d0f8 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23156.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23156.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23163.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23163.1" } } From 488ee6e38300882014bcbd0c36d075abed0c0b15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:48:11 +0000 Subject: [PATCH 546/864] [main] Update dependencies from dotnet/sdk (#15789) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c66f263d4..b7af48f88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6692fa1c9b067ce600df9ad504a0a10d56975339 + 212be2cdff0ed0fcbbf05995743d0273dbc72968 - + https://github.com/dotnet/sdk - 6692fa1c9b067ce600df9ad504a0a10d56975339 + 212be2cdff0ed0fcbbf05995743d0273dbc72968 - + https://github.com/dotnet/sdk - 6692fa1c9b067ce600df9ad504a0a10d56975339 + 212be2cdff0ed0fcbbf05995743d0273dbc72968 - + https://github.com/dotnet/sdk - 6692fa1c9b067ce600df9ad504a0a10d56975339 + 212be2cdff0ed0fcbbf05995743d0273dbc72968 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 648d477858b5723059085de84966a2247cfdc0e7 + d9f453924f7c3cca9f02d920a57e1477293f216e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4b8c4cb35..c2673953e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23164.3 - 8.0.100-preview.3.23164.3 - 8.0.100-preview.3.23164.3 + 8.0.100-preview.3.23164.7 + 8.0.100-preview.3.23164.7 + 8.0.100-preview.3.23164.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23163.12 - 8.0.0-preview.3.23163.12 - 8.0.0-preview.3.23163.12 - 8.0.0-preview.3.23163.12 - 8.0.0-preview.3.23163.12 - 8.0.0-preview.3.23163.12 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 2.1.0 From 0060952987d2d3dfd1e58bf6ae5370ea646bf04c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:50:40 +0000 Subject: [PATCH 547/864] [main] Update dependencies from dotnet/source-build-externals (#15788) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7af48f88..fc57edd7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 57af468ca0fed21a073bd42d46fa6a2181fc7f18 + 181f91eb28ecfb2e9a998efee1947aeb35baee1f From 8d453fa00438d0e0fc241f70adeccf60fe6252ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:50:54 +0000 Subject: [PATCH 548/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15786) [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 4e823806a..16093b1d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e - + https://github.com/dotnet/sdk - 081249fc2d499c2d3acd105d2d79696db742024a + 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e diff --git a/eng/Versions.props b/eng/Versions.props index a6d042519..9bf3f89ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23164.2 - 7.0.300-preview.23164.2 - 7.0.300-preview.23164.2 + 7.0.300-preview.23164.4 + 7.0.300-preview.23164.4 + 7.0.300-preview.23164.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5a29d06ee92e9557dc7fade0b2419358d3a07f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 18:04:40 +0000 Subject: [PATCH 549/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.8 --- 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 fc57edd7f..fd0f4d5b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 212be2cdff0ed0fcbbf05995743d0273dbc72968 + a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 - + https://github.com/dotnet/sdk - 212be2cdff0ed0fcbbf05995743d0273dbc72968 + a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 - + https://github.com/dotnet/sdk - 212be2cdff0ed0fcbbf05995743d0273dbc72968 + a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 - + https://github.com/dotnet/sdk - 212be2cdff0ed0fcbbf05995743d0273dbc72968 + a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 diff --git a/eng/Versions.props b/eng/Versions.props index c2673953e..4f609e003 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23164.7 - 8.0.100-preview.3.23164.7 - 8.0.100-preview.3.23164.7 + 8.0.100-preview.3.23164.8 + 8.0.100-preview.3.23164.8 + 8.0.100-preview.3.23164.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 01df29f5e3a043956bc01f962d99dec881fb55f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 19:10:04 +0000 Subject: [PATCH 550/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23161.1 -> To Version 12.5.0-beta.23163.3 (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 fd0f4d5b0..5d87a87a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 + 471bb77f176918fcf69e340e798c4fa6d9da38c1 - + https://github.com/dotnet/sdk - a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 + 471bb77f176918fcf69e340e798c4fa6d9da38c1 - + https://github.com/dotnet/sdk - a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 + 471bb77f176918fcf69e340e798c4fa6d9da38c1 - + https://github.com/dotnet/sdk - a5e0a4784f74f92d2452c54a6f8c7d0c94ad6496 + 471bb77f176918fcf69e340e798c4fa6d9da38c1 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf a5a00f37f05be7a71f7af1bbca6edc3000921d8f - + https://github.com/dotnet/fsharp - 50ede7324c833488ee6769b18662d0e7be31c862 + c941623cc85b3598448e80b31a0a01241848610f - + https://github.com/dotnet/fsharp - 50ede7324c833488ee6769b18662d0e7be31c862 + c941623cc85b3598448e80b31a0a01241848610f @@ -151,9 +151,9 @@ 1314d090671dc1a1500c5303c4b5ae9150f40d98 - + https://github.com/dotnet/msbuild - f776814442dc189b442ba87e3bdf1656c45dce81 + 18fe510422c6cf65533add0c82b9d4d190e5df28 diff --git a/eng/Versions.props b/eng/Versions.props index 4f609e003..214bc7b63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23164.8 - 8.0.100-preview.3.23164.8 - 8.0.100-preview.3.23164.8 + 8.0.100-preview.3.23164.9 + 8.0.100-preview.3.23164.9 + 8.0.100-preview.3.23164.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37b2615ffdd4ae98b92573e060af5bd84b987ec9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 20:10:11 +0000 Subject: [PATCH 551/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.11 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 8.0.0-preview.3.23163.11 -> To Version 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d87a87a7..3bfad73c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime d9f453924f7c3cca9f02d920a57e1477293f216e - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca - + https://github.com/dotnet/aspnetcore - 09e9ed7edbbaf6f43cb083d633908b4459a90d8c + dca54bec0016f11adc671d2f53fcb3ffc5378fca https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 471bb77f176918fcf69e340e798c4fa6d9da38c1 + 798ea673749a0f3325ce3f960724efb3ea88d193 - + https://github.com/dotnet/sdk - 471bb77f176918fcf69e340e798c4fa6d9da38c1 + 798ea673749a0f3325ce3f960724efb3ea88d193 - + https://github.com/dotnet/sdk - 471bb77f176918fcf69e340e798c4fa6d9da38c1 + 798ea673749a0f3325ce3f960724efb3ea88d193 - + https://github.com/dotnet/sdk - 471bb77f176918fcf69e340e798c4fa6d9da38c1 + 798ea673749a0f3325ce3f960724efb3ea88d193 diff --git a/eng/Versions.props b/eng/Versions.props index 214bc7b63..e241f01ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-preview.3.23163.11 - 8.0.0-preview.3.23163.11 - 8.0.0-preview.3.23163.11 - 8.0.0-preview.3.23163.11 - 8.0.0-preview.3.23163.11 - 8.0.0-preview.3.23163.11 - 8.0.0-preview.3.23163.11 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 0.2.0 - 8.0.100-preview.3.23164.9 - 8.0.100-preview.3.23164.9 - 8.0.100-preview.3.23164.9 + 8.0.100-preview.3.23164.11 + 8.0.100-preview.3.23164.11 + 8.0.100-preview.3.23164.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be832a92bbfead1f28fe37ef30d3d5b45972d0a1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 Mar 2023 13:40:06 -0700 Subject: [PATCH 552/864] 6.0.15 just released to updating the version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..9a6f19663 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 30 32 17 - 14 + 15 From 68640a3ff2733989b3ae6601fef3e860f8af5454 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 21:21:39 +0000 Subject: [PATCH 553/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.18 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 8.0.0-preview.3.23163.11 -> To Version 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.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 3bfad73c1..195b3461b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 798ea673749a0f3325ce3f960724efb3ea88d193 + 5894be0a36c3df986448993e43938badf4d44b0d - + https://github.com/dotnet/sdk - 798ea673749a0f3325ce3f960724efb3ea88d193 + 5894be0a36c3df986448993e43938badf4d44b0d - + https://github.com/dotnet/sdk - 798ea673749a0f3325ce3f960724efb3ea88d193 + 5894be0a36c3df986448993e43938badf4d44b0d - + https://github.com/dotnet/sdk - 798ea673749a0f3325ce3f960724efb3ea88d193 + 5894be0a36c3df986448993e43938badf4d44b0d diff --git a/eng/Versions.props b/eng/Versions.props index e241f01ea..2a2d66656 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23164.11 - 8.0.100-preview.3.23164.11 - 8.0.100-preview.3.23164.11 + 8.0.100-preview.3.23164.18 + 8.0.100-preview.3.23164.18 + 8.0.100-preview.3.23164.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 519872ba872905fc631b749924624ec447ef0bf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:28:14 +0000 Subject: [PATCH 554/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.20 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 195b3461b..f27362d75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 551dd11c3af07b8fcb0e465277179893cdf5bea1 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 5894be0a36c3df986448993e43938badf4d44b0d + bfb8ada632d079498f5da1e0917b25b4469d9ecf - + https://github.com/dotnet/sdk - 5894be0a36c3df986448993e43938badf4d44b0d + bfb8ada632d079498f5da1e0917b25b4469d9ecf - + https://github.com/dotnet/sdk - 5894be0a36c3df986448993e43938badf4d44b0d + bfb8ada632d079498f5da1e0917b25b4469d9ecf - + https://github.com/dotnet/sdk - 5894be0a36c3df986448993e43938badf4d44b0d + bfb8ada632d079498f5da1e0917b25b4469d9ecf @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - d9f453924f7c3cca9f02d920a57e1477293f216e + d6b89c66d492c1e0b0a88d797264039c50c4f4b7 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2a2d66656..49afe114d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,25 +71,25 @@ - 8.0.100-preview.3.23164.18 - 8.0.100-preview.3.23164.18 - 8.0.100-preview.3.23164.18 + 8.0.100-preview.3.23164.20 + 8.0.100-preview.3.23164.20 + 8.0.100-preview.3.23164.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.4 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23164.4 2.1.0 From b0f9f6f3c7bd5b8d1e078526b64de12b411132b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:40:21 +0000 Subject: [PATCH 555/864] Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16093b1d2..044e8923c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..895f275b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23122.4 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 9890ccd94..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } } From f1d6cda9f086e5742c16de00c2ecaa981b0f31a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:40:22 +0000 Subject: [PATCH 556/864] Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3 --- NuGet.config | 26 +++++++++++++++++++++----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7723bf088..e0e0db215 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,33 @@ - - + + + - + + + + + + + + + @@ -47,16 +56,23 @@ - - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a71d8ff..f8cab39ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 28736b4b4..cb68e967c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23122.4 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 9890ccd94..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } } From c43b7f00f50a475d4371f3bf03c8ba018247fc82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 22:51:03 +0000 Subject: [PATCH 557/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.4 -> To Version 7.0.300-preview.23164.22 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16093b1d2..75c8c7f23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc - + https://github.com/dotnet/sdk - 3172c2d9cba7b56c99fbb26637f8fc2a5e993d8e + 278bb569e3618a41a1d2ed6a4c336e55783ad4cc diff --git a/eng/Versions.props b/eng/Versions.props index 6209eb4c5..22ec40b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.4 - 7.0.300-preview.23164.4 - 7.0.300-preview.23164.4 + 7.0.300-preview.23164.22 + 7.0.300-preview.23164.22 + 7.0.300-preview.23164.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 6dc228043adeac730a4328c13292fe1201cc79aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Mar 2023 23:39:26 +0000 Subject: [PATCH 558/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.23 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.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 f27362d75..be14a4c0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - bfb8ada632d079498f5da1e0917b25b4469d9ecf + a68ba5f45f0993596a3955817611405da7b967ed - + https://github.com/dotnet/sdk - bfb8ada632d079498f5da1e0917b25b4469d9ecf + a68ba5f45f0993596a3955817611405da7b967ed - + https://github.com/dotnet/sdk - bfb8ada632d079498f5da1e0917b25b4469d9ecf + a68ba5f45f0993596a3955817611405da7b967ed - + https://github.com/dotnet/sdk - bfb8ada632d079498f5da1e0917b25b4469d9ecf + a68ba5f45f0993596a3955817611405da7b967ed diff --git a/eng/Versions.props b/eng/Versions.props index 49afe114d..021f8e402 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23164.20 - 8.0.100-preview.3.23164.20 - 8.0.100-preview.3.23164.20 + 8.0.100-preview.3.23164.23 + 8.0.100-preview.3.23164.23 + 8.0.100-preview.3.23164.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5be16403534e236bc5ea157f02c540490c3f590e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 00:45:03 +0000 Subject: [PATCH 559/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.24 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.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 be14a4c0d..ce0fc0f04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a68ba5f45f0993596a3955817611405da7b967ed + fda0d039903a4b77b86c1504f8f3201c9dc5862a - + https://github.com/dotnet/sdk - a68ba5f45f0993596a3955817611405da7b967ed + fda0d039903a4b77b86c1504f8f3201c9dc5862a - + https://github.com/dotnet/sdk - a68ba5f45f0993596a3955817611405da7b967ed + fda0d039903a4b77b86c1504f8f3201c9dc5862a - + https://github.com/dotnet/sdk - a68ba5f45f0993596a3955817611405da7b967ed + fda0d039903a4b77b86c1504f8f3201c9dc5862a diff --git a/eng/Versions.props b/eng/Versions.props index 021f8e402..d098264d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23164.23 - 8.0.100-preview.3.23164.23 - 8.0.100-preview.3.23164.23 + 8.0.100-preview.3.23164.24 + 8.0.100-preview.3.23164.24 + 8.0.100-preview.3.23164.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e9bf76aad88b93ab7809c90401ba895cf7c0a059 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 02:46:40 +0000 Subject: [PATCH 560/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.31 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (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 ce0fc0f04..dd78d5c83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - fda0d039903a4b77b86c1504f8f3201c9dc5862a + 78f32973f2c07f5fca716cfef4819f0abc80584f - + https://github.com/dotnet/sdk - fda0d039903a4b77b86c1504f8f3201c9dc5862a + 78f32973f2c07f5fca716cfef4819f0abc80584f - + https://github.com/dotnet/sdk - fda0d039903a4b77b86c1504f8f3201c9dc5862a + 78f32973f2c07f5fca716cfef4819f0abc80584f - + https://github.com/dotnet/sdk - fda0d039903a4b77b86c1504f8f3201c9dc5862a + 78f32973f2c07f5fca716cfef4819f0abc80584f @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime d6b89c66d492c1e0b0a88d797264039c50c4f4b7 - + https://github.com/dotnet/roslyn - 1314d090671dc1a1500c5303c4b5ae9150f40d98 + 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index d098264d9..d9c56b126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ - 8.0.100-preview.3.23164.24 - 8.0.100-preview.3.23164.24 - 8.0.100-preview.3.23164.24 + 8.0.100-preview.3.23164.31 + 8.0.100-preview.3.23164.31 + 8.0.100-preview.3.23164.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 52aeec5f31b06dbef91bdf8639f74c5b4c4f985f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 03:04:47 +0000 Subject: [PATCH 561/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.22 -> To Version 7.0.300-preview.23164.30 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23152.6 -> To Version 4.6.0-2.23164.1 (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 d47ab3714..7953d5765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 - + https://github.com/dotnet/sdk - 278bb569e3618a41a1d2ed6a4c336e55783ad4cc + b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 1314d090671dc1a1500c5303c4b5ae9150f40d98 + 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 7cfa25d08..8c8cd1d06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.22 - 7.0.300-preview.23164.22 - 7.0.300-preview.23164.22 + 7.0.300-preview.23164.30 + 7.0.300-preview.23164.30 + 7.0.300-preview.23164.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a32cfc478c64ccd1beb551d018603cdf1e8954a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 07:21:12 +0000 Subject: [PATCH 562/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23164.30 -> To Version 7.0.300-preview.23164.37 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.45 -> To Version 6.6.0-preview.3.46 (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 7953d5765..d3376c0b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 - + https://github.com/dotnet/sdk - b6b2b0b4f035fc8ab52b1bd3ab11959a433e1ee8 + 1e443ce28676af05870aecfdb9e7f487b772b4b5 @@ -154,9 +154,9 @@ 18fe510422c6cf65533add0c82b9d4d190e5df28 - + https://github.com/nuget/nuget.client - fdc39cc7f7541056c638ea982dc179f554849b7d + ac7977c16f6d4c7d48ad3c624b6d5caa46c4447f diff --git a/eng/Versions.props b/eng/Versions.props index 8c8cd1d06..275d54584 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.30 - 7.0.300-preview.23164.30 - 7.0.300-preview.23164.30 + 7.0.300-preview.23164.37 + 7.0.300-preview.23164.37 + 7.0.300-preview.23164.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 958b74c5ef7184e18019ace6804de5fabb7e5523 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 07:36:15 +0000 Subject: [PATCH 563/864] Update dependencies from https://github.com/dotnet/sdk build 20230314.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23164.31 -> To Version 8.0.100-preview.3.23164.38 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd78d5c83..df185ea69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 78f32973f2c07f5fca716cfef4819f0abc80584f + 83971ae73e9a40583d4648ab746e0c44bd03572d - + https://github.com/dotnet/sdk - 78f32973f2c07f5fca716cfef4819f0abc80584f + 83971ae73e9a40583d4648ab746e0c44bd03572d - + https://github.com/dotnet/sdk - 78f32973f2c07f5fca716cfef4819f0abc80584f + 83971ae73e9a40583d4648ab746e0c44bd03572d - + https://github.com/dotnet/sdk - 78f32973f2c07f5fca716cfef4819f0abc80584f + 83971ae73e9a40583d4648ab746e0c44bd03572d diff --git a/eng/Versions.props b/eng/Versions.props index a3551db75..87d3cbe34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23164.31 - 8.0.100-preview.3.23164.31 - 8.0.100-preview.3.23164.31 + 8.0.100-preview.3.23164.38 + 8.0.100-preview.3.23164.38 + 8.0.100-preview.3.23164.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -131,8 +131,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(VersionFeature70), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 89cf0a81c74760239e81b7efddfa30d20ec9c17e Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 15 Mar 2023 11:03:37 -0500 Subject: [PATCH 564/864] Source-build 6.0.115 March 2023 updates. (#15799) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MsftToSbSdk.diff | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6bcd2bcc0..0db857f4b 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.114.1 + 6.0.115 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 1ddd98bf4..1cb989e5e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.114" + "dotnet": "6.0.115" }, "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 1b86a0d2e..af55e4865 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 @@ -545,4 +545,7 @@ index ------------ -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.resources.dll ./sdk/x.y.z/zh-Hant/MSBuild.resources.dll ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll - ./shared/ \ No newline at end of file + ./sdk/x.y.z/zh-Hant/vstest.console.resources.dll + ./shared/ + ./shared/Microsoft.AspNetCore.App/x.y.z/ + From eaebe23ea2a4f1ca6d1922a5db1458cd2ad4668c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 09:44:37 -0700 Subject: [PATCH 565/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15814) 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 d3376c0b9..17b9b958a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d - + https://github.com/dotnet/sdk - 1e443ce28676af05870aecfdb9e7f487b772b4b5 + 8e9ee2651dc301bb2ad800f9dcc83a514923d19d @@ -149,9 +149,9 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - 18fe510422c6cf65533add0c82b9d4d190e5df28 + 60ea2f733cfcc78da965ab43cf040fe5c58800fb diff --git a/eng/Versions.props b/eng/Versions.props index 275d54584..7e218b178 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23164.37 - 7.0.300-preview.23164.37 - 7.0.300-preview.23164.37 + 7.0.300-preview.23165.11 + 7.0.300-preview.23165.11 + 7.0.300-preview.23165.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cb88897531fbe9694f2f7c39c623d993d2561dde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:35:50 +0000 Subject: [PATCH 566/864] [release/7.0.1xx] Update dependencies from dotnet/arcade (#15822) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 +++++++++++++++------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0c5b2dd3..93f5df6c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,30 @@ - - + + + - + + + + + + @@ -47,16 +53,19 @@ - - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f059ff56..35b0b7e8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 6fe32e1a8..171319712 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23114.3 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 5039463a8..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } } From 1292769903544f09f4a7a4fb786a2de6051716ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 19:58:23 +0000 Subject: [PATCH 567/864] [main] Update dependencies from dotnet/arcade (#15820) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23151-02 to 1.2.0-beta-23163-01 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23151.1 to 1.0.0-beta.23160.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df185ea69..893107027 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 - + https://github.com/dotnet/arcade - a0a9c59876ae267d27d64c9b157337681208c1bc + 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 https://github.com/dotnet/arcade-services @@ -217,14 +217,14 @@ a848f811a52d75494029e663cd0a799be11744fe - + https://github.com/dotnet/sourcelink - 5585cd4cd5779bc7efdf3e2f19ed0bef50b15f7b + 084aa5d8e6d73d66f8e8b2adaddafae755852f26 - + https://github.com/dotnet/xliff-tasks - 95794aa6747aa08b79869e7dac06a9ac5d922ab2 + 0437e392b8b20068b8b2e1c6c9c34c011927bbb9 diff --git a/eng/Versions.props b/eng/Versions.props index 87d3cbe34..e2bc21855 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23163.1 + 8.0.0-beta.23164.2 diff --git a/global.json b/global.json index 3d281d0f8..4640e2eb4 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23163.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23163.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23164.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23164.2" } } From a28f460a92bb53b63dd433f1fb92236c492a12ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 19:59:22 +0000 Subject: [PATCH 568/864] [main] Update dependencies from dotnet/sdk (#15819) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.3.23160.3 to 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.3.23160.3 to 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.3.23160.3 to 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23160.3 to 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23160.3 to 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 893107027..282e5a7f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 551dd11c3af07b8fcb0e465277179893cdf5bea1 + 437601213fdd61c3c90ace55e81ebc99dea96e3b - + https://github.com/dotnet/windowsdesktop - 551dd11c3af07b8fcb0e465277179893cdf5bea1 + 437601213fdd61c3c90ace55e81ebc99dea96e3b - + https://github.com/dotnet/windowsdesktop - 551dd11c3af07b8fcb0e465277179893cdf5bea1 + 437601213fdd61c3c90ace55e81ebc99dea96e3b - + https://github.com/dotnet/windowsdesktop - 551dd11c3af07b8fcb0e465277179893cdf5bea1 + 437601213fdd61c3c90ace55e81ebc99dea96e3b https://github.com/dotnet/runtime @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 83971ae73e9a40583d4648ab746e0c44bd03572d + 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb - + https://github.com/dotnet/sdk - 83971ae73e9a40583d4648ab746e0c44bd03572d + 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb - + https://github.com/dotnet/sdk - 83971ae73e9a40583d4648ab746e0c44bd03572d + 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb - + https://github.com/dotnet/sdk - 83971ae73e9a40583d4648ab746e0c44bd03572d + 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb diff --git a/eng/Versions.props b/eng/Versions.props index e2bc21855..a445d893a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23164.38 - 8.0.100-preview.3.23164.38 - 8.0.100-preview.3.23164.38 + 8.0.100-preview.3.23165.10 + 8.0.100-preview.3.23165.10 + 8.0.100-preview.3.23165.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -101,10 +101,10 @@ - 8.0.0-preview.3.23160.3 - 8.0.0-preview.3.23160.3 - 8.0.0-preview.3.23160.3 - 8.0.0-preview.3.23160.3 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.1 From a7401397b6ab01eec14f2b9fd0c00587dd94450e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 20:40:25 +0000 Subject: [PATCH 569/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23165.10 -> To Version 8.0.100-preview.3.23165.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-preview.3.23164.1 -> To Version 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 282e5a7f9..b2b646cdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 437601213fdd61c3c90ace55e81ebc99dea96e3b + 90bad961e26f73ef3b2eccb864c6463a4092c251 - + https://github.com/dotnet/windowsdesktop - 437601213fdd61c3c90ace55e81ebc99dea96e3b + 90bad961e26f73ef3b2eccb864c6463a4092c251 - + https://github.com/dotnet/windowsdesktop - 437601213fdd61c3c90ace55e81ebc99dea96e3b + 90bad961e26f73ef3b2eccb864c6463a4092c251 - + https://github.com/dotnet/windowsdesktop - 437601213fdd61c3c90ace55e81ebc99dea96e3b + 90bad961e26f73ef3b2eccb864c6463a4092c251 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb + 300a8b73e8980e638787d2020dccb9fbdadd5330 - + https://github.com/dotnet/sdk - 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb + 300a8b73e8980e638787d2020dccb9fbdadd5330 - + https://github.com/dotnet/sdk - 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb + 300a8b73e8980e638787d2020dccb9fbdadd5330 - + https://github.com/dotnet/sdk - 4b46f8bd2b1c49b81d7b49649837a4b9b0093abb + 300a8b73e8980e638787d2020dccb9fbdadd5330 https://github.com/dotnet/winforms cdef38a8c587ed438465456f5843f4204001c127 - + https://github.com/dotnet/wpf - a5a00f37f05be7a71f7af1bbca6edc3000921d8f + 9678cb23fbe9019f8c89c30375e2eace578a8d02 https://github.com/dotnet/fsharp @@ -151,14 +151,14 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - 18fe510422c6cf65533add0c82b9d4d190e5df28 + 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - fdc39cc7f7541056c638ea982dc179f554849b7d + ddffda6517a01d88d6eeaef24dfc0c490c7f62a0 diff --git a/eng/Versions.props b/eng/Versions.props index a445d893a..85609fa53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,7 +45,7 @@ - 8.0.0-preview.3.23160.1 + 8.0.0-preview.3.23164.6 @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23165.10 - 8.0.100-preview.3.23165.10 - 8.0.100-preview.3.23165.10 + 8.0.100-preview.3.23165.14 + 8.0.100-preview.3.23165.14 + 8.0.100-preview.3.23165.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -101,10 +101,10 @@ - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23164.2 From 3ba3a540630e7e71e6f8509f19b367073a731a73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 21:23:15 +0000 Subject: [PATCH 570/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23165.10 -> To Version 8.0.100-preview.3.23165.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-preview.3.23164.1 -> To Version 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.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 b2b646cdd..fdadb0dee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 300a8b73e8980e638787d2020dccb9fbdadd5330 + 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 - + https://github.com/dotnet/sdk - 300a8b73e8980e638787d2020dccb9fbdadd5330 + 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 - + https://github.com/dotnet/sdk - 300a8b73e8980e638787d2020dccb9fbdadd5330 + 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 - + https://github.com/dotnet/sdk - 300a8b73e8980e638787d2020dccb9fbdadd5330 + 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 diff --git a/eng/Versions.props b/eng/Versions.props index 85609fa53..86a538010 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23165.14 - 8.0.100-preview.3.23165.14 - 8.0.100-preview.3.23165.14 + 8.0.100-preview.3.23165.16 + 8.0.100-preview.3.23165.16 + 8.0.100-preview.3.23165.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5f1eea877266e5c849a34cb2c368c625f76abdc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:01:25 +0000 Subject: [PATCH 571/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15825) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23121.1 to 7.0.100-1.23165.1 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.3.46 to 6.6.0-preview.3.48 (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 17b9b958a..9fb5cb23e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 - + https://github.com/dotnet/sdk - 8e9ee2651dc301bb2ad800f9dcc83a514923d19d + 574630cfaf547ff17817e39954c9f122a0625ff9 @@ -138,9 +138,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/linker - b516999ab57ce68da016b68cc2a09e2c15208e68 + d3fc41eadc9ff73ae8e20eb6f874cf5321714c0b linker @@ -154,9 +154,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - ac7977c16f6d4c7d48ad3c624b6d5caa46c4447f + ddffda6517a01d88d6eeaef24dfc0c490c7f62a0 diff --git a/eng/Versions.props b/eng/Versions.props index cc6d465f8..7f34ca54a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.11 - 7.0.300-preview.23165.11 - 7.0.300-preview.23165.11 + 7.0.300-preview.23165.15 + 7.0.300-preview.23165.15 + 7.0.300-preview.23165.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ea3aacce98b4ef4f595256b66f17734b8c12e9b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 22:30:51 +0000 Subject: [PATCH 572/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23165.10 -> To Version 8.0.100-preview.3.23165.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.1 -> To Version 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdadb0dee..9b2e23378 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 90bad961e26f73ef3b2eccb864c6463a4092c251 - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 + 6215831f014d7a6a623e75cdd28583f2fa8d7270 - + https://github.com/dotnet/sdk - 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 + 6215831f014d7a6a623e75cdd28583f2fa8d7270 - + https://github.com/dotnet/sdk - 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 + 6215831f014d7a6a623e75cdd28583f2fa8d7270 - + https://github.com/dotnet/sdk - 45a346b2401aa7506d69f6fb14c84dd7bdb02f32 + 6215831f014d7a6a623e75cdd28583f2fa8d7270 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - d6b89c66d492c1e0b0a88d797264039c50c4f4b7 + ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 86a538010..8536b8dbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,25 +78,25 @@ - 8.0.100-preview.3.23165.16 - 8.0.100-preview.3.23165.16 - 8.0.100-preview.3.23165.16 + 8.0.100-preview.3.23165.17 + 8.0.100-preview.3.23165.17 + 8.0.100-preview.3.23165.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23165.3 - 8.0.0-preview.3.23164.4 - 8.0.0-preview.3.23164.4 - 8.0.0-preview.3.23164.4 - 8.0.0-preview.3.23164.4 - 8.0.0-preview.3.23164.4 - 8.0.0-preview.3.23164.4 + 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.3 2.1.0 From 3ca17395996106f6b211fce4edb00f6ef9805c9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 23:03:55 +0000 Subject: [PATCH 573/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23165.15 -> To Version 7.0.300-preview.23165.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23163.3 -> To Version 12.5.0-beta.23165.4 (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 9fb5cb23e..2d65b3961 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f - + https://github.com/dotnet/sdk - 574630cfaf547ff17817e39954c9f122a0625ff9 + 56262afc3d3db7a9cef92e23d3508e2fcaeb808f @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - c941623cc85b3598448e80b31a0a01241848610f + f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae - + https://github.com/dotnet/fsharp - c941623cc85b3598448e80b31a0a01241848610f + f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae diff --git a/eng/Versions.props b/eng/Versions.props index 7f34ca54a..f4c37bae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.15 - 7.0.300-preview.23165.15 - 7.0.300-preview.23165.15 + 7.0.300-preview.23165.21 + 7.0.300-preview.23165.21 + 7.0.300-preview.23165.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7fbfe43cd951a8771c1e26c534a1308ffb25d29 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 15 Mar 2023 18:33:01 -0500 Subject: [PATCH 574/864] Source-build 7.0.104 March 2023 updates. (#15800) --- eng/Versions.props | 4 ++-- .../content/eng/bootstrap/OverrideBootstrapVersions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 171319712..54b14ea3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,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.103 - 7.0.103 + 7.0.104 + 7.0.104 diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props index ced02e960..82542a831 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -2,7 +2,7 @@ - 7.0.0-rtm.22518.5 + 7.0.4-servicing.23107.6 $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 4ebdc2be0..56136778d 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103" + "dotnet": "7.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 37a0dda5d1afbeb9a337fb22085b3c502fca4fd5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Mar 2023 23:35:03 +0000 Subject: [PATCH 575/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23165.10 -> To Version 8.0.100-preview.3.23165.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.1 -> To Version 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b2e23378..485072227 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 - + https://github.com/dotnet/aspnetcore - dca54bec0016f11adc671d2f53fcb3ffc5378fca + 5db028af68c4636673e4cde980e6da18538e8929 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6215831f014d7a6a623e75cdd28583f2fa8d7270 + 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 - + https://github.com/dotnet/sdk - 6215831f014d7a6a623e75cdd28583f2fa8d7270 + 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 - + https://github.com/dotnet/sdk - 6215831f014d7a6a623e75cdd28583f2fa8d7270 + 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 - + https://github.com/dotnet/sdk - 6215831f014d7a6a623e75cdd28583f2fa8d7270 + 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 diff --git a/eng/Versions.props b/eng/Versions.props index 8536b8dbb..c8a456a9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 - 8.0.0-preview.3.23164.1 + 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23164.14 0.2.0 - 8.0.100-preview.3.23165.17 - 8.0.100-preview.3.23165.17 - 8.0.100-preview.3.23165.17 + 8.0.100-preview.3.23165.22 + 8.0.100-preview.3.23165.22 + 8.0.100-preview.3.23165.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11fc1e8580db23f75796defe955131af03de82b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 04:18:10 +0000 Subject: [PATCH 576/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23165.21 -> To Version 7.0.300-preview.23165.28 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23165.4 -> To Version 12.5.0-beta.23165.8 (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 2d65b3961..881f00ba9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 - + https://github.com/dotnet/sdk - 56262afc3d3db7a9cef92e23d3508e2fcaeb808f + 892e807345094d04f4662e888a7c1d856acee519 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae + 2a827fdff7e07ec013c299ac6c9e7dabea87d554 - + https://github.com/dotnet/fsharp - f252dc2cecdb4ff4ff679a7abbdb3d79dc5d6aae + 2a827fdff7e07ec013c299ac6c9e7dabea87d554 diff --git a/eng/Versions.props b/eng/Versions.props index f4c37bae8..8cc876bf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.21 - 7.0.300-preview.23165.21 - 7.0.300-preview.23165.21 + 7.0.300-preview.23165.28 + 7.0.300-preview.23165.28 + 7.0.300-preview.23165.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e93510de0f3fda436e086635d46d40993474b97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 06:23:07 +0000 Subject: [PATCH 577/864] Update dependencies from https://github.com/dotnet/sdk build 20230315.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23165.22 -> To Version 8.0.100-preview.3.23165.29 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23165.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 485072227..bd97f8aa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 90bad961e26f73ef3b2eccb864c6463a4092c251 + 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e - + https://github.com/dotnet/windowsdesktop - 90bad961e26f73ef3b2eccb864c6463a4092c251 + 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e - + https://github.com/dotnet/windowsdesktop - 90bad961e26f73ef3b2eccb864c6463a4092c251 + 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e - + https://github.com/dotnet/windowsdesktop - 90bad961e26f73ef3b2eccb864c6463a4092c251 + 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 - + https://github.com/dotnet/aspnetcore - 5db028af68c4636673e4cde980e6da18538e8929 + 496e249b0d541a13de84a45292417a1769c00432 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 + b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 - + https://github.com/dotnet/sdk - 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 + b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 - + https://github.com/dotnet/sdk - 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 + b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 - + https://github.com/dotnet/sdk - 4e1fea2490933afa8fc44c9fa7f3f0d3c0c95a48 + b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - ccefbf9eb36cb3d8adb36f4b141914c2c6cc489b + 1936536dff9c37bf5fa9ff582ddf8a8082727af8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c8a456a9d..8a5c67962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,46 +65,46 @@ - 8.0.0-preview.3.23164.14 - 8.0.0-preview.3.23164.14 - 8.0.0-preview.3.23164.14 - 8.0.0-preview.3.23164.14 - 8.0.0-preview.3.23164.14 - 8.0.0-preview.3.23164.14 - 8.0.0-preview.3.23164.14 + 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.5 0.2.0 - 8.0.100-preview.3.23165.22 - 8.0.100-preview.3.23165.22 - 8.0.100-preview.3.23165.22 + 8.0.100-preview.3.23165.29 + 8.0.100-preview.3.23165.29 + 8.0.100-preview.3.23165.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.10 - 8.0.0-preview.3.23165.3 - 8.0.0-preview.3.23165.3 - 8.0.0-preview.3.23165.3 - 8.0.0-preview.3.23165.3 - 8.0.0-preview.3.23165.3 - 8.0.0-preview.3.23165.3 + 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23165.10 2.1.0 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 - 8.0.0-preview.3.23164.2 + 8.0.0-preview.3.23165.1 + 8.0.0-preview.3.23165.1 + 8.0.0-preview.3.23165.1 + 8.0.0-preview.3.23165.1 From 4efc8275102e1d4c6836b105ea13c5ebaac1c596 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:11:45 -0700 Subject: [PATCH 578/864] [release/7.0.2xx] Update dependencies from dotnet/test-templates (#15834) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 26 -------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0e0db215..3038e77bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,23 +18,10 @@ - - - - - - - - - - - - - @@ -58,22 +45,9 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8cab39ca..64bd34ec5 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 - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 diff --git a/eng/Versions.props b/eng/Versions.props index cb68e967c..855f52d0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 From 283378d69393e4e8b73e415171677a14d3aa21b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:13:06 -0700 Subject: [PATCH 579/864] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15835) 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 881f00ba9..fcb79a3ce 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 - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 diff --git a/eng/Versions.props b/eng/Versions.props index 8cc876bf7..2565cc366 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 - 1.1.0-rc.23115.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 From 271ca11e718d512c80e922e5b6a7e3909ef64be6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:11:49 +0000 Subject: [PATCH 580/864] [main] Update dependencies from dotnet/test-templates (#15833) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd97f8aa4..2e495786f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/test-templates - 94c498e399eb1cbb7290ed1e42564589a259312a + 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8a5c67962..01e3b0c12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 1.0.2-beta4.22406.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 - 1.1.0-rc.23115.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 + 1.1.0-rc.23166.1 From c18627f4afd7b54722c0eb108b5b1ee08c27b74e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:12:37 +0000 Subject: [PATCH 581/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15839) [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 fcb79a3ce..4f34c38ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 - + https://github.com/dotnet/sdk - 892e807345094d04f4662e888a7c1d856acee519 + 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 diff --git a/eng/Versions.props b/eng/Versions.props index 2565cc366..9008894dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23165.28 - 7.0.300-preview.23165.28 - 7.0.300-preview.23165.28 + 7.0.300-preview.23166.4 + 7.0.300-preview.23166.4 + 7.0.300-preview.23166.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 09a7f08b687b84b2ad8cb58f382633d1f1d9a69d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:12:55 +0000 Subject: [PATCH 582/864] [main] Update dependencies from dotnet/sdk (#15831) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.3.23165.1 to 8.0.0-preview.3.23165.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.3.23165.1 to 8.0.0-preview.3.23165.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.3.23165.1 to 8.0.0-preview.3.23165.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.3.23165.5 to 8.0.0-preview.3.23165.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23165.1 to 8.0.0-preview.3.23165.8 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23165.1 to 8.0.0-preview.3.23165.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.3.23164.6 to 8.0.0-preview.3.23165.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23165.10 to 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++---------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e495786f..82e8c04ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e + 6adac1c3949a703547f32d479971f0ca3a8290ec - + https://github.com/dotnet/windowsdesktop - 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e + 6adac1c3949a703547f32d479971f0ca3a8290ec - + https://github.com/dotnet/windowsdesktop - 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e + 6adac1c3949a703547f32d479971f0ca3a8290ec - + https://github.com/dotnet/windowsdesktop - 9b530b1a364bbc4970dc8b6c0cb6e949cda9639e + 6adac1c3949a703547f32d479971f0ca3a8290ec - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 - + https://github.com/dotnet/aspnetcore - 496e249b0d541a13de84a45292417a1769c00432 + 354efd4d6d2488adb117b82293ec9619d9aa2dd9 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 + 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 - + https://github.com/dotnet/sdk - b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 + 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 - + https://github.com/dotnet/sdk - b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 + 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 - + https://github.com/dotnet/sdk - b09d8896a1bc3a2339d152aaa6ae61533ca7f4f0 + 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 https://github.com/dotnet/winforms cdef38a8c587ed438465456f5843f4204001c127 - + https://github.com/dotnet/wpf - 9678cb23fbe9019f8c89c30375e2eace578a8d02 + 4e1d2a4e3cf678a03596ad95e120fb5bc1225ea3 https://github.com/dotnet/fsharp @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 1936536dff9c37bf5fa9ff582ddf8a8082727af8 + 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 01e3b0c12..8caa43aff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,7 +45,7 @@ - 8.0.0-preview.3.23164.6 + 8.0.0-preview.3.23165.1 @@ -65,46 +65,46 @@ - 8.0.0-preview.3.23165.5 - 8.0.0-preview.3.23165.5 - 8.0.0-preview.3.23165.5 - 8.0.0-preview.3.23165.5 - 8.0.0-preview.3.23165.5 - 8.0.0-preview.3.23165.5 - 8.0.0-preview.3.23165.5 + 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23165.6 0.2.0 - 8.0.100-preview.3.23165.29 - 8.0.100-preview.3.23165.29 - 8.0.100-preview.3.23165.29 + 8.0.100-preview.3.23166.7 + 8.0.100-preview.3.23166.7 + 8.0.100-preview.3.23166.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23165.10 - 8.0.0-preview.3.23165.10 - 8.0.0-preview.3.23165.10 - 8.0.0-preview.3.23165.10 - 8.0.0-preview.3.23165.10 - 8.0.0-preview.3.23165.10 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 2.1.0 - 8.0.0-preview.3.23165.1 - 8.0.0-preview.3.23165.1 - 8.0.0-preview.3.23165.1 - 8.0.0-preview.3.23165.1 + 8.0.0-preview.3.23165.8 + 8.0.0-preview.3.23165.8 + 8.0.0-preview.3.23165.8 + 8.0.0-preview.3.23165.8 From 09f15bf95af52f1948e0ea27eb700f8b046d7727 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:14:04 +0000 Subject: [PATCH 583/864] [main] Update dependencies from dotnet/source-build-externals (#15832) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82e8c04ea..697669000 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 181f91eb28ecfb2e9a998efee1947aeb35baee1f + c440136d26fcd3bda4289755023ee91dff20c4f7 From 719e62945f883f39e0dc4a8805e712a677098277 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 20:49:24 +0000 Subject: [PATCH 584/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23166.7 -> To Version 8.0.100-preview.3.23166.13 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-preview.3.23165.6 -> To Version 8.0.0-preview.3.23166.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 697669000..c1a9fa86b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b - + https://github.com/dotnet/aspnetcore - 354efd4d6d2488adb117b82293ec9619d9aa2dd9 + 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 + 6fe01a3d001469de904246ce24fdb11c4ac6058d - + https://github.com/dotnet/sdk - 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 + 6fe01a3d001469de904246ce24fdb11c4ac6058d - + https://github.com/dotnet/sdk - 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 + 6fe01a3d001469de904246ce24fdb11c4ac6058d - + https://github.com/dotnet/sdk - 213f9ecc1e257a6b8a99d62e92c8bd734298a2d7 + 6fe01a3d001469de904246ce24fdb11c4ac6058d @@ -156,9 +156,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - ddffda6517a01d88d6eeaef24dfc0c490c7f62a0 + b9b418e95ed428961af59f3ee5883f37cf4b0004 diff --git a/eng/Versions.props b/eng/Versions.props index 8caa43aff..b674dcb93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23165.6 - 8.0.0-preview.3.23165.6 - 8.0.0-preview.3.23165.6 - 8.0.0-preview.3.23165.6 - 8.0.0-preview.3.23165.6 - 8.0.0-preview.3.23165.6 - 8.0.0-preview.3.23165.6 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.1 0.2.0 - 8.0.100-preview.3.23166.7 - 8.0.100-preview.3.23166.7 - 8.0.100-preview.3.23166.7 + 8.0.100-preview.3.23166.13 + 8.0.100-preview.3.23166.13 + 8.0.100-preview.3.23166.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0683f0cdea2d63d9b61b62ac7d2fd2aab501928f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 21:14:10 +0000 Subject: [PATCH 585/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.4 -> To Version 7.0.300-preview.23166.14 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.48 -> To Version 6.6.0-preview.3.50 (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 4f34c38ac..10ee330d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 - + https://github.com/dotnet/sdk - 4b5fd479e63d1c480741fb32aa7d84e875f87ec9 + a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 @@ -154,9 +154,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - ddffda6517a01d88d6eeaef24dfc0c490c7f62a0 + b9b418e95ed428961af59f3ee5883f37cf4b0004 diff --git a/eng/Versions.props b/eng/Versions.props index 9008894dc..a1e5f6c5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23166.4 - 7.0.300-preview.23166.4 - 7.0.300-preview.23166.4 + 7.0.300-preview.23166.14 + 7.0.300-preview.23166.14 + 7.0.300-preview.23166.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28db6e3d8c8376243e863cab37bc7521c8ca0dc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 22:01:06 +0000 Subject: [PATCH 586/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23166.7 -> To Version 8.0.100-preview.3.23166.16 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 8.0.0-preview.3.23165.6 -> To Version 8.0.0-preview.3.23166.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 c1a9fa86b..2911eb2f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 6fe01a3d001469de904246ce24fdb11c4ac6058d + f64a5e00cde74a3f7aa9a972795617438c475003 - + https://github.com/dotnet/sdk - 6fe01a3d001469de904246ce24fdb11c4ac6058d + f64a5e00cde74a3f7aa9a972795617438c475003 - + https://github.com/dotnet/sdk - 6fe01a3d001469de904246ce24fdb11c4ac6058d + f64a5e00cde74a3f7aa9a972795617438c475003 - + https://github.com/dotnet/sdk - 6fe01a3d001469de904246ce24fdb11c4ac6058d + f64a5e00cde74a3f7aa9a972795617438c475003 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 4e1d2a4e3cf678a03596ad95e120fb5bc1225ea3 - + https://github.com/dotnet/fsharp - c941623cc85b3598448e80b31a0a01241848610f + 2a827fdff7e07ec013c299ac6c9e7dabea87d554 - + https://github.com/dotnet/fsharp - c941623cc85b3598448e80b31a0a01241848610f + 2a827fdff7e07ec013c299ac6c9e7dabea87d554 diff --git a/eng/Versions.props b/eng/Versions.props index b674dcb93..5dccb630d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23166.13 - 8.0.100-preview.3.23166.13 - 8.0.100-preview.3.23166.13 + 8.0.100-preview.3.23166.16 + 8.0.100-preview.3.23166.16 + 8.0.100-preview.3.23166.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e50ef9da63689709869c4e902ecc4ac903753fe9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 02:47:26 +0000 Subject: [PATCH 587/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23166.16 -> To Version 8.0.100-preview.3.23166.17 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset From Version 8.0.0-preview.3.23166.1 -> To Version 8.0.0-preview.3.23166.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2911eb2f5..80a74c6dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c - + https://github.com/dotnet/aspnetcore - 2745e0b1e0b8bdfe428d8d115cae0d0f42bcea7b + 00f78805650b05312a6c43f733382b7a8fe1e19c https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - f64a5e00cde74a3f7aa9a972795617438c475003 + 3293143ab978964c8ef56c32ced4eb1465196b5c - + https://github.com/dotnet/sdk - f64a5e00cde74a3f7aa9a972795617438c475003 + 3293143ab978964c8ef56c32ced4eb1465196b5c - + https://github.com/dotnet/sdk - f64a5e00cde74a3f7aa9a972795617438c475003 + 3293143ab978964c8ef56c32ced4eb1465196b5c - + https://github.com/dotnet/sdk - f64a5e00cde74a3f7aa9a972795617438c475003 + 3293143ab978964c8ef56c32ced4eb1465196b5c @@ -146,7 +146,7 @@ https://github.com/dotnet/runtime 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 5dccb630d..3ef7c950c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.8 0.2.0 - 8.0.100-preview.3.23166.16 - 8.0.100-preview.3.23166.16 - 8.0.100-preview.3.23166.16 + 8.0.100-preview.3.23166.17 + 8.0.100-preview.3.23166.17 + 8.0.100-preview.3.23166.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c028d681add95784160e4a44ac7a05a0af2c1e89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 03:11:40 +0000 Subject: [PATCH 588/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.14 -> To Version 7.0.300-preview.23166.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23165.8 -> To Version 12.5.0-beta.23166.3 (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 10ee330d0..caca19631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 - + https://github.com/dotnet/sdk - a07609ab7708d65a3fd6719ea5c1be372a4fe6f0 + ba515ce838a5a35f7c845aa9db39fdecaffc9a79 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 2a827fdff7e07ec013c299ac6c9e7dabea87d554 + bf1480450655ba8da5a3721c9aa783488f519a8d - + https://github.com/dotnet/fsharp - 2a827fdff7e07ec013c299ac6c9e7dabea87d554 + bf1480450655ba8da5a3721c9aa783488f519a8d diff --git a/eng/Versions.props b/eng/Versions.props index a1e5f6c5c..9df167fc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23166.14 - 7.0.300-preview.23166.14 - 7.0.300-preview.23166.14 + 7.0.300-preview.23166.18 + 7.0.300-preview.23166.18 + 7.0.300-preview.23166.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76d3f8766b5aebfacbf36dd036f0a5d0b31f7cc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 03:49:10 +0000 Subject: [PATCH 589/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23166.16 -> To Version 8.0.100-preview.3.23166.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23166.1 -> To Version 8.0.0-preview.3.23166.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80a74c6dd..298a20fbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 6adac1c3949a703547f32d479971f0ca3a8290ec - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 3293143ab978964c8ef56c32ced4eb1465196b5c + 36382373c9edb97a7f610fb5c52089b33ee3a9fc - + https://github.com/dotnet/sdk - 3293143ab978964c8ef56c32ced4eb1465196b5c + 36382373c9edb97a7f610fb5c52089b33ee3a9fc - + https://github.com/dotnet/sdk - 3293143ab978964c8ef56c32ced4eb1465196b5c + 36382373c9edb97a7f610fb5c52089b33ee3a9fc - + https://github.com/dotnet/sdk - 3293143ab978964c8ef56c32ced4eb1465196b5c + 36382373c9edb97a7f610fb5c52089b33ee3a9fc @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 7f0c19acfcfe1d89d1aaee814e6fd00b3ff1c8a2 + 56223423e5f81264371b76ab9476229716df8d91 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 3ef7c950c..4d4cabe71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,25 +78,25 @@ - 8.0.100-preview.3.23166.17 - 8.0.100-preview.3.23166.17 - 8.0.100-preview.3.23166.17 + 8.0.100-preview.3.23166.19 + 8.0.100-preview.3.23166.19 + 8.0.100-preview.3.23166.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.7 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 - 8.0.0-preview.3.23166.1 + 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23166.7 2.1.0 From 4b9c79a6a1641af84aa7e1e7fed7ce63d77a9128 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 04:18:06 +0000 Subject: [PATCH 590/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.14 -> To Version 7.0.300-preview.23166.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23165.8 -> To Version 12.5.0-beta.23166.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caca19631..9ec20b790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 - + https://github.com/dotnet/sdk - ba515ce838a5a35f7c845aa9db39fdecaffc9a79 + a746e615dba27e2a81e697d1d6eb2937695bb727 @@ -144,7 +144,7 @@ linker - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 9df167fc3..954114f0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23166.18 - 7.0.300-preview.23166.18 - 7.0.300-preview.23166.18 + 7.0.300-preview.23166.20 + 7.0.300-preview.23166.20 + 7.0.300-preview.23166.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f9ca140f33a31f25f76d8544af99ef0d3a72f749 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 06:21:33 +0000 Subject: [PATCH 591/864] Update dependencies from https://github.com/dotnet/sdk build 20230316.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23166.19 -> To Version 8.0.100-preview.3.23166.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0-preview.3.23165.8 -> To Version 8.0.0-preview.3.23166.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 298a20fbe..2a15b3ef3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 6adac1c3949a703547f32d479971f0ca3a8290ec + 4a76e92097156502a11a4cb0844313ea1b22b665 - + https://github.com/dotnet/windowsdesktop - 6adac1c3949a703547f32d479971f0ca3a8290ec + 4a76e92097156502a11a4cb0844313ea1b22b665 - + https://github.com/dotnet/windowsdesktop - 6adac1c3949a703547f32d479971f0ca3a8290ec + 4a76e92097156502a11a4cb0844313ea1b22b665 - + https://github.com/dotnet/windowsdesktop - 6adac1c3949a703547f32d479971f0ca3a8290ec + 4a76e92097156502a11a4cb0844313ea1b22b665 https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 56223423e5f81264371b76ab9476229716df8d91 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 - + https://github.com/dotnet/aspnetcore - 00f78805650b05312a6c43f733382b7a8fe1e19c + 2a7dc900bc0a2c87340595d943c25260fe3a3b94 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 36382373c9edb97a7f610fb5c52089b33ee3a9fc + 3abfbcf34ae753601d701b0e4ce56eb0b2597eec - + https://github.com/dotnet/sdk - 36382373c9edb97a7f610fb5c52089b33ee3a9fc + 3abfbcf34ae753601d701b0e4ce56eb0b2597eec - + https://github.com/dotnet/sdk - 36382373c9edb97a7f610fb5c52089b33ee3a9fc + 3abfbcf34ae753601d701b0e4ce56eb0b2597eec - + https://github.com/dotnet/sdk - 36382373c9edb97a7f610fb5c52089b33ee3a9fc + 3abfbcf34ae753601d701b0e4ce56eb0b2597eec - + https://github.com/dotnet/winforms - cdef38a8c587ed438465456f5843f4204001c127 + 6da50a7da9c96c217b564974bf63ce39fcec5509 - + https://github.com/dotnet/wpf - 4e1d2a4e3cf678a03596ad95e120fb5bc1225ea3 + 0872456e77ceb779b7376eb47bc2cb1ecbdefb5b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4d4cabe71..68d313e35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.3.23159.2 + 8.0.0-preview.3.23161.2 - 8.0.0-preview.3.23165.1 + 8.0.0-preview.3.23165.8 @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23166.8 - 8.0.0-preview.3.23166.8 - 8.0.0-preview.3.23166.8 - 8.0.0-preview.3.23166.8 - 8.0.0-preview.3.23166.8 - 8.0.0-preview.3.23166.8 - 8.0.0-preview.3.23166.8 + 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23166.9 0.2.0 - 8.0.100-preview.3.23166.19 - 8.0.100-preview.3.23166.19 - 8.0.100-preview.3.23166.19 + 8.0.100-preview.3.23166.24 + 8.0.100-preview.3.23166.24 + 8.0.100-preview.3.23166.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -101,10 +101,10 @@ - 8.0.0-preview.3.23165.8 - 8.0.0-preview.3.23165.8 - 8.0.0-preview.3.23165.8 - 8.0.0-preview.3.23165.8 + 8.0.0-preview.3.23166.3 + 8.0.0-preview.3.23166.3 + 8.0.0-preview.3.23166.3 + 8.0.0-preview.3.23166.3 From d61af06e1d94130038d8c15cce11729314f69024 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 12:22:11 +0000 Subject: [PATCH 592/864] Update dependencies from https://github.com/dotnet/arcade build 20230316.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23164.2 -> To Version 8.0.0-beta.23166.5 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23163-01 -> To Version 1.2.0-beta-23165-02 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/tools.ps1 | 14 ++++++++------ global.json | 4 ++-- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a15b3ef3..c0ca188e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - 0edf826d30ecfec312a2f36c3a688ef2449fa6b0 + a1359bf50fe84f9b1cd01d611c9186820126df9b https://github.com/dotnet/arcade-services @@ -217,14 +217,14 @@ a848f811a52d75494029e663cd0a799be11744fe - + https://github.com/dotnet/sourcelink - 084aa5d8e6d73d66f8e8b2adaddafae755852f26 + 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 - + https://github.com/dotnet/xliff-tasks - 0437e392b8b20068b8b2e1c6c9c34c011927bbb9 + b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 diff --git a/eng/Versions.props b/eng/Versions.props index 68d313e35..82eff1790 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23164.2 + 8.0.0-beta.23166.5 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7caacc6de..8ad03be3e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -913,11 +913,13 @@ if (!$disableConfigureToolsetImport) { function Enable-Nuget-EnhancedRetry() { if ($ci) { Write-Host "Setting NUGET enhanced retry environment variables" - $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' - $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 - $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 - Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + $env:NUGET_ENABLE_ENHANCED_HTTP_RETRY = 'true' + $env:NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT = 6 + $env:NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 + $env:NUGET_RETRY_HTTP_429 = 'true' + Write-PipelineSetVariable -Name 'NUGET_ENABLE_ENHANCED_HTTP_RETRY' -Value 'true' + Write-PipelineSetVariable -Name 'NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT' -Value '6' + Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } } diff --git a/global.json b/global.json index 4640e2eb4..3bbb674bb 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23164.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23164.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23166.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23166.5" } } From 836203e3fa4db8e1f7e7b45f70fb9659b01bb1d7 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 17 Mar 2023 11:30:33 -0500 Subject: [PATCH 593/864] Use consistent packages across platforms for bootstrap (#15823) --- .../buildBootstrapPreviouslySB.csproj | 125 ++++++++++++------ 1 file changed, 86 insertions(+), 39 deletions(-) diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index e7b95574e..92b3d120e 100644 --- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -12,48 +12,95 @@ $(ArchiveDir)Private.SourceBuilt.Artifacts.Bootstrap.tar.gz + + + false + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + %(LinuxRid.Identity) + + + + + %(LinuxRid.Identity) + + + + + + + %(RuntimePackWithLinuxRid.Identity).%(RuntimePackWithLinuxRid.LinuxRid) + + + + + %(PortablePackageWithLinuxRid.Identity) + + + + + runtime.%(PortablePackageWithLinuxRid.LinuxRid).%(PortablePackageWithLinuxRid.Identity) + + + runtime.%(PortablePackageWithLinuxRid.LinuxRid).runtime.native.%(PortablePackageWithLinuxRid.Identity) + + + + + + + + + + From ab6236957b338ae8ec9e5c20b51da6a48b931d0c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 17 Mar 2023 12:29:27 -0500 Subject: [PATCH 594/864] Update SB version info for 8.0 Preview 2 release (#15851) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 7499b5851..948b3a0af 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-11.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 3d6c8c8ee..e59da05d1 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23080.2" + "dotnet": "8.0.100-preview.2.23157.25" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 588bbbe6d7dcaa7f3957f73fabbcbf85948e1a28 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:19:18 -0700 Subject: [PATCH 595/864] Add version property for Roslyn (#15843) This will enable #15216 to use MicrosoftNetCompilersToolsetPackageVersion and have it automatically update using DARC. --- eng/Versions.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 68d313e35..2943a13f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,6 +85,10 @@ $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) + + + 4.6.0-2.23166.9 + 8.0.0-preview.3.23166.7 From 2d2287032dee3fa78373c5a49c6574dea67c6a96 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 17 Mar 2023 14:41:54 -0500 Subject: [PATCH 596/864] Update SB prebuilt tarball version (#15855) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 948b3a0af..475faf820 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-11.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-12.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz From 956fbfc3d528bcc34dade6f0066e6e72649ef981 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:13:31 +0000 Subject: [PATCH 597/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15853) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0ca188e1..2a51e93fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a848f811a52d75494029e663cd0a799be11744fe + fdbe4632b67ee16bd1856417cda93fdbf84139ec From d28141c578df338edbbca8c8823e9742cc54b40b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:14:25 +0000 Subject: [PATCH 598/864] [main] Update dependencies from dotnet/source-build-externals (#15850) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a51e93fe..099155c48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c440136d26fcd3bda4289755023ee91dff20c4f7 + 9338b8c86e9a170c9b0c1b35ab1210d2c74829d6 From abf98a19aa12b607455557f2aad60752b11c2786 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:15:26 +0000 Subject: [PATCH 599/864] [main] Update dependencies from dotnet/sdk (#15852) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23166.7 to 8.0.0-preview.3.23167.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 099155c48..ff1eed714 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 4a76e92097156502a11a4cb0844313ea1b22b665 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 3abfbcf34ae753601d701b0e4ce56eb0b2597eec + 23bbdf8e62544b04afd333920b109877f427b637 - + https://github.com/dotnet/sdk - 3abfbcf34ae753601d701b0e4ce56eb0b2597eec + 23bbdf8e62544b04afd333920b109877f427b637 - + https://github.com/dotnet/sdk - 3abfbcf34ae753601d701b0e4ce56eb0b2597eec + 23bbdf8e62544b04afd333920b109877f427b637 - + https://github.com/dotnet/sdk - 3abfbcf34ae753601d701b0e4ce56eb0b2597eec + 23bbdf8e62544b04afd333920b109877f427b637 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 56223423e5f81264371b76ab9476229716df8d91 + 27fe4461113c4c0be354ce188d27cf9797d7d632 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 694a6cb6b..f1ae60610 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23166.24 - 8.0.100-preview.3.23166.24 - 8.0.100-preview.3.23166.24 + 8.0.100-preview.3.23167.5 + 8.0.100-preview.3.23167.5 + 8.0.100-preview.3.23167.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23167.2 - 8.0.0-preview.3.23166.7 - 8.0.0-preview.3.23166.7 - 8.0.0-preview.3.23166.7 - 8.0.0-preview.3.23166.7 - 8.0.0-preview.3.23166.7 - 8.0.0-preview.3.23166.7 + 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.2 2.1.0 From 1dab7fb3d7e8b5946beaba329d3c87c0df394fef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 20:54:00 +0000 Subject: [PATCH 600/864] Update dependencies from https://github.com/dotnet/sdk build 20230317.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23167.5 -> To Version 8.0.100-preview.3.23167.12 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.3.23166.9 -> To Version 8.0.0-preview.3.23167.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff1eed714..a3f073b29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 27fe4461113c4c0be354ce188d27cf9797d7d632 - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e - + https://github.com/dotnet/aspnetcore - 2a7dc900bc0a2c87340595d943c25260fe3a3b94 + f7e68a870f82c9fb904000096a1f23d0e862777e https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 23bbdf8e62544b04afd333920b109877f427b637 + 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 - + https://github.com/dotnet/sdk - 23bbdf8e62544b04afd333920b109877f427b637 + 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 - + https://github.com/dotnet/sdk - 23bbdf8e62544b04afd333920b109877f427b637 + 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 - + https://github.com/dotnet/sdk - 23bbdf8e62544b04afd333920b109877f427b637 + 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 diff --git a/eng/Versions.props b/eng/Versions.props index f1ae60610..e0a9c00eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23166.9 - 8.0.0-preview.3.23166.9 - 8.0.0-preview.3.23166.9 - 8.0.0-preview.3.23166.9 - 8.0.0-preview.3.23166.9 - 8.0.0-preview.3.23166.9 - 8.0.0-preview.3.23166.9 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 0.2.0 - 8.0.100-preview.3.23167.5 - 8.0.100-preview.3.23167.5 - 8.0.100-preview.3.23167.5 + 8.0.100-preview.3.23167.12 + 8.0.100-preview.3.23167.12 + 8.0.100-preview.3.23167.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d984eb7c32e424157491b336863fafdca49cb3a8 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 17 Mar 2023 15:54:03 -0500 Subject: [PATCH 601/864] Revert "Update SB version info for 8.0 Preview 2 release (#15851)" (#15856) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 475faf820..510c2daf8 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-12.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index e59da05d1..3d6c8c8ee 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.2.23157.25" + "dotnet": "8.0.100-alpha.1.23080.2" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 4a0cd984cae0387bd678007f7a975aae77034b50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 21:18:07 +0000 Subject: [PATCH 602/864] Update dependencies from https://github.com/dotnet/sdk build 20230317.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.20 -> To Version 7.0.300-preview.23167.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.3 -> To Version 7.0.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++---------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ec20b790..9b0bea276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://github.com/dotnet/sdk - a746e615dba27e2a81e697d1d6eb2937695bb727 + 8ed29bc36092166f479646aa4ad6f01352866ddb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cce692f665cbefe335ed33369897cea328d5fbcf + 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a09c7d17212981cb4fd5907fa6a6214966a366d + 0315841ebb89a21c717002224ad9d39f3c21320a https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eceb7a185..517b302bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.3-servicing.23072.1 + 7.0.4-servicing.23117.7 - 7.0.3-servicing.23073.1 + 7.0.4-servicing.23117.7 @@ -56,46 +56,46 @@ - 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 + 7.0.4 + 7.0.4 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 0.2.0 - 7.0.300-preview.23166.20 - 7.0.300-preview.23166.20 - 7.0.300-preview.23166.20 + 7.0.300-preview.23167.13 + 7.0.300-preview.23167.13 + 7.0.300-preview.23167.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.1 - 7.0.3-servicing.23069.10 - 7.0.3-servicing.23069.10 - 7.0.3 - 7.0.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 + 7.0.4 + 7.0.4 + 7.0.4 + 7.0.4 2.1.0 - 7.0.3-servicing.23073.3 - 7.0.3-servicing.23073.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23118.3 + 7.0.4-servicing.23118.3 + 7.0.4 + 7.0.4 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.3 - 7.0.3 + 7.0.4 + 7.0.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From be53e233b1777ce220e4e30d981d324e0a132925 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 22:22:44 +0000 Subject: [PATCH 603/864] Update dependencies from https://github.com/dotnet/sdk build 20230317.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23167.5 -> To Version 8.0.100-preview.3.23167.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23167.2 -> To Version 8.0.0-preview.3.23167.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3f073b29..ed4a69912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 4a76e92097156502a11a4cb0844313ea1b22b665 - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 + 6fcc7cde5cfd6a0272376907428039d900c69ee4 - + https://github.com/dotnet/sdk - 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 + 6fcc7cde5cfd6a0272376907428039d900c69ee4 - + https://github.com/dotnet/sdk - 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 + 6fcc7cde5cfd6a0272376907428039d900c69ee4 - + https://github.com/dotnet/sdk - 6bf0e9a8a20507d6895f215f7a1e30e7abc191f1 + 6fcc7cde5cfd6a0272376907428039d900c69ee4 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 0872456e77ceb779b7376eb47bc2cb1ecbdefb5b - + https://github.com/dotnet/fsharp - 2a827fdff7e07ec013c299ac6c9e7dabea87d554 + bf1480450655ba8da5a3721c9aa783488f519a8d - + https://github.com/dotnet/fsharp - 2a827fdff7e07ec013c299ac6c9e7dabea87d554 + bf1480450655ba8da5a3721c9aa783488f519a8d @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 27fe4461113c4c0be354ce188d27cf9797d7d632 + 3c381894b737bb1a56a21f16d0710a0c61908a1a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e0a9c00eb..344d60d15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23167.12 - 8.0.100-preview.3.23167.12 - 8.0.100-preview.3.23167.12 + 8.0.100-preview.3.23167.14 + 8.0.100-preview.3.23167.14 + 8.0.100-preview.3.23167.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.2 - 8.0.0-preview.3.23167.2 - 8.0.0-preview.3.23167.2 - 8.0.0-preview.3.23167.2 - 8.0.0-preview.3.23167.2 - 8.0.0-preview.3.23167.2 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.3 2.1.0 From f77df9880b3720b2b2352fe02c5f4c77c19f1805 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Mar 2023 22:46:56 +0000 Subject: [PATCH 604/864] Update dependencies from https://github.com/dotnet/sdk build 20230317.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23166.20 -> To Version 7.0.300-preview.23167.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.3 -> To Version 7.0.4 (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 9b0bea276..b39b714d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a - + https://github.com/dotnet/sdk - 8ed29bc36092166f479646aa4ad6f01352866ddb + b846680f22bcc552e84507e11d8e1ebe7bfbe62a @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - bf1480450655ba8da5a3721c9aa783488f519a8d + b84ecd1811491b6df2689eb3543c1411a898b9cd - + https://github.com/dotnet/fsharp - bf1480450655ba8da5a3721c9aa783488f519a8d + b84ecd1811491b6df2689eb3543c1411a898b9cd diff --git a/eng/Versions.props b/eng/Versions.props index 517b302bd..a530936ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23167.13 - 7.0.300-preview.23167.13 - 7.0.300-preview.23167.13 + 7.0.300-preview.23167.15 + 7.0.300-preview.23167.15 + 7.0.300-preview.23167.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3ca0db8956623a55772c644e0a0628c8bcfc4a5b Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:21:23 -0700 Subject: [PATCH 605/864] Generate version for Roslyn packages (#15216) Co-authored-by: Forgind --- src/redist/targets/GenerateBundledVersions.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f9f381b7f..c26ce129b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -351,6 +351,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\')) %24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs + $(MicrosoftNetCompilersToolsetPackageVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) From f4303ba5a884c3cd755851e131e66f51be5b7cbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Mar 2023 01:05:58 +0000 Subject: [PATCH 606/864] Update dependencies from https://github.com/dotnet/sdk build 20230317.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23167.5 -> To Version 8.0.100-preview.3.23167.16 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23167.2 -> To Version 8.0.0-preview.3.23167.3 (parent: Microsoft.NET.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 ed4a69912..d127395a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 6fcc7cde5cfd6a0272376907428039d900c69ee4 + a919da73739fdd464eb5222cef4f9d76939b605d - + https://github.com/dotnet/sdk - 6fcc7cde5cfd6a0272376907428039d900c69ee4 + a919da73739fdd464eb5222cef4f9d76939b605d - + https://github.com/dotnet/sdk - 6fcc7cde5cfd6a0272376907428039d900c69ee4 + a919da73739fdd464eb5222cef4f9d76939b605d - + https://github.com/dotnet/sdk - 6fcc7cde5cfd6a0272376907428039d900c69ee4 + a919da73739fdd464eb5222cef4f9d76939b605d diff --git a/eng/Versions.props b/eng/Versions.props index 344d60d15..3e500f3c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23167.14 - 8.0.100-preview.3.23167.14 - 8.0.100-preview.3.23167.14 + 8.0.100-preview.3.23167.16 + 8.0.100-preview.3.23167.16 + 8.0.100-preview.3.23167.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf491fe1e77231acbdaa994f271a759ee04519b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Mar 2023 04:54:30 +0000 Subject: [PATCH 607/864] Update dependencies from https://github.com/dotnet/sdk build 20230317.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23167.5 -> To Version 8.0.100-preview.3.23167.17 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.3.23167.2 -> To Version 8.0.0-preview.3.23167.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d127395a4..3a4f500ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 3c381894b737bb1a56a21f16d0710a0c61908a1a - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e - + https://github.com/dotnet/aspnetcore - f7e68a870f82c9fb904000096a1f23d0e862777e + c52fd930f70e102d5e5c84e85180e451861eaf7e https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a919da73739fdd464eb5222cef4f9d76939b605d + 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 - + https://github.com/dotnet/sdk - a919da73739fdd464eb5222cef4f9d76939b605d + 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 - + https://github.com/dotnet/sdk - a919da73739fdd464eb5222cef4f9d76939b605d + 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 - + https://github.com/dotnet/sdk - a919da73739fdd464eb5222cef4f9d76939b605d + 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 diff --git a/eng/Versions.props b/eng/Versions.props index 3e500f3c8..181fc07bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23167.7 0.2.0 - 8.0.100-preview.3.23167.16 - 8.0.100-preview.3.23167.16 - 8.0.100-preview.3.23167.16 + 8.0.100-preview.3.23167.17 + 8.0.100-preview.3.23167.17 + 8.0.100-preview.3.23167.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3e33408b61f9714fd2d03a844dfa94a5c610490a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Mar 2023 12:24:33 +0000 Subject: [PATCH 608/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230317.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23166.4 -> To Version 8.0.0-alpha.1.23167.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff1eed714..418560151 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 9338b8c86e9a170c9b0c1b35ab1210d2c74829d6 + dcd0eca339b5c64b5816c111f583c82062ce4c74 From a8a1479e4920feeb7dbd032d9f78509ea7927b55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Mar 2023 12:18:44 +0000 Subject: [PATCH 609/864] Update dependencies from https://github.com/dotnet/arcade build 20230318.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23166.5 -> To Version 8.0.0-beta.23168.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff1eed714..1fc4c266a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d - + https://github.com/dotnet/arcade - a1359bf50fe84f9b1cd01d611c9186820126df9b + b12f035e893c34ec2c965d75f6e21b7a2667e98d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f1ae60610..62886d661 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23166.5 + 8.0.0-beta.23168.1 diff --git a/global.json b/global.json index 3bbb674bb..c6817ae56 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23166.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23166.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23168.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23168.1" } } From d2b6e62fd1e474469b31a88a64f250ca9e4564c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 03:40:30 +0000 Subject: [PATCH 610/864] Update dependencies from https://github.com/dotnet/sdk build 20230319.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23167.17 -> To Version 8.0.100-preview.3.23169.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23167.3 -> To Version 8.0.0-preview.3.23168.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8a1b2fed..0b434ee42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 4a76e92097156502a11a4cb0844313ea1b22b665 - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 - + https://github.com/dotnet/aspnetcore - c52fd930f70e102d5e5c84e85180e451861eaf7e + 7c8a4db4d1019bf716e04cf3b782c76297872156 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 + 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a - + https://github.com/dotnet/sdk - 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 + 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a - + https://github.com/dotnet/sdk - 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 + 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a - + https://github.com/dotnet/sdk - 4b8de6857076720f7c9fded5f20a5d6f4c3acb65 + 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 0872456e77ceb779b7376eb47bc2cb1ecbdefb5b - + https://github.com/dotnet/fsharp - bf1480450655ba8da5a3721c9aa783488f519a8d + 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 - + https://github.com/dotnet/fsharp - bf1480450655ba8da5a3721c9aa783488f519a8d + 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 3c381894b737bb1a56a21f16d0710a0c61908a1a + 2aec3816f9bbc0eda3261daa335a05ea0df31b9c https://github.com/dotnet/roslyn @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 352d64e0ce9b99a8cff6207621432a986920ffd9 + 25d9f7a5e38a2d61b94ff341bc0d32135fcb15f9 diff --git a/eng/Versions.props b/eng/Versions.props index 069c0e7c1..c557b7ce5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23167.7 - 8.0.0-preview.3.23167.7 - 8.0.0-preview.3.23167.7 - 8.0.0-preview.3.23167.7 - 8.0.0-preview.3.23167.7 - 8.0.0-preview.3.23167.7 - 8.0.0-preview.3.23167.7 + 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.2 0.2.0 - 8.0.100-preview.3.23167.17 - 8.0.100-preview.3.23167.17 - 8.0.100-preview.3.23167.17 + 8.0.100-preview.3.23169.1 + 8.0.100-preview.3.23169.1 + 8.0.100-preview.3.23169.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23168.2 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 - 8.0.0-preview.3.23167.3 + 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23168.2 2.1.0 @@ -231,7 +231,7 @@ 13.1.227-net8-p1 16.1.1015-net8-p1 - 8.0.0-preview.3.23160.1 + 8.0.0-preview.3.23167.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 381f5826754b8ae357dfe10ca5f88f70b3cbf7bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 06:42:15 +0000 Subject: [PATCH 611/864] Update dependencies from https://github.com/dotnet/sdk build 20230319.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23167.15 -> To Version 7.0.300-preview.23169.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23167.3 -> To Version 12.5.0-beta.23167.4 (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 b39b714d1..2b934533d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa - + https://github.com/dotnet/sdk - b846680f22bcc552e84507e11d8e1ebe7bfbe62a + bc621fa963db1d094ddd298054d96cd8466343fa @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - b84ecd1811491b6df2689eb3543c1411a898b9cd + 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 - + https://github.com/dotnet/fsharp - b84ecd1811491b6df2689eb3543c1411a898b9cd + 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 diff --git a/eng/Versions.props b/eng/Versions.props index a530936ca..924cac14d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23167.15 - 7.0.300-preview.23167.15 - 7.0.300-preview.23167.15 + 7.0.300-preview.23169.3 + 7.0.300-preview.23169.3 + 7.0.300-preview.23169.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5710e00392795ca6115a176680692b4e9e444778 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 10:19:29 +0000 Subject: [PATCH 612/864] [main] Update dependencies from dotnet/sdk (#15863) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.3.23166.3 to 8.0.0-preview.3.23169.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.3.23166.3 to 8.0.0-preview.3.23169.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.3.23166.3 to 8.0.0-preview.3.23169.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.3.23169.2 to 8.0.0-preview.3.23169.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23166.3 to 8.0.0-preview.3.23169.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.3.23161.2 to 8.0.0-preview.3.23166.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23166.3 to 8.0.0-preview.3.23169.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.3.23165.8 to 8.0.0-preview.3.23167.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b434ee42..00c7055b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 4a76e92097156502a11a4cb0844313ea1b22b665 + a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/windowsdesktop - 4a76e92097156502a11a4cb0844313ea1b22b665 + a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/windowsdesktop - 4a76e92097156502a11a4cb0844313ea1b22b665 + a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/windowsdesktop - 4a76e92097156502a11a4cb0844313ea1b22b665 + a27867a7347d595702e30cb25acb60b76f4614c3 https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 2aec3816f9bbc0eda3261daa335a05ea0df31b9c - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 - + https://github.com/dotnet/aspnetcore - 7c8a4db4d1019bf716e04cf3b782c76297872156 + d482bf3f8eea8071fb89fe481a956c9b56ff1c74 https://github.com/dotnet/test-templates @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a + 50221a4d0f656e2e65f497aa912cd323b298dee0 - + https://github.com/dotnet/sdk - 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a + 50221a4d0f656e2e65f497aa912cd323b298dee0 - + https://github.com/dotnet/sdk - 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a + 50221a4d0f656e2e65f497aa912cd323b298dee0 - + https://github.com/dotnet/sdk - 9b00ba5fe8b12e2a6de87a9e8337ea43690cb33a + 50221a4d0f656e2e65f497aa912cd323b298dee0 - + https://github.com/dotnet/winforms - 6da50a7da9c96c217b564974bf63ce39fcec5509 + 1a220e9268d2d38f719d2cd721628fe6e270d2d2 - + https://github.com/dotnet/wpf - 0872456e77ceb779b7376eb47bc2cb1ecbdefb5b + 5d596bd99a06466c7b7aa67f7f66b108abad809a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c557b7ce5..f0c1aa7b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.3.23161.2 + 8.0.0-preview.3.23166.3 - 8.0.0-preview.3.23165.8 + 8.0.0-preview.3.23167.14 @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23169.2 - 8.0.0-preview.3.23169.2 - 8.0.0-preview.3.23169.2 - 8.0.0-preview.3.23169.2 - 8.0.0-preview.3.23169.2 - 8.0.0-preview.3.23169.2 - 8.0.0-preview.3.23169.2 + 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23169.3 0.2.0 - 8.0.100-preview.3.23169.1 - 8.0.100-preview.3.23169.1 - 8.0.100-preview.3.23169.1 + 8.0.100-preview.3.23170.1 + 8.0.100-preview.3.23170.1 + 8.0.100-preview.3.23170.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.0-preview.3.23166.3 - 8.0.0-preview.3.23166.3 - 8.0.0-preview.3.23166.3 - 8.0.0-preview.3.23166.3 + 8.0.0-preview.3.23169.1 + 8.0.0-preview.3.23169.1 + 8.0.0-preview.3.23169.1 + 8.0.0-preview.3.23169.1 From c29cfc127db06501c7c39def8e2bb1d62a871d64 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 20 Mar 2023 08:50:12 -0500 Subject: [PATCH 613/864] Update MAUI baseline manifests Fixes: https://github.com/dotnet/sdk/issues/31260 A problem can occur if you: * Install .NET 8 Preview 3 * `dotnet workload install maui`, some pack fails to install: Workload installation failed: microsoft.ios.sdk::16.2.37 is not found in NuGet feeds Workload installation failed: microsoft.android.sdk.windows::33.0.46 is not found in NuGet feeds The current baseline manifests point to nightly builds right now, and so this fails unless you add the `dotnet8` feed: --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json I think going forward, a reasonable solution will be: * We always put public builds in the baseline manifests. * MAUI baseline manifests lag behind one release. This might change as we get to RCs or closer to GA. Note that this will not solve: https://github.com/dotnet/installer/issues/15804 As the baseline manifests will always lag behind 1 release. --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f0c1aa7b9..943853e81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,13 +223,13 @@ - 8.0.100-preview.1 - 8.0.0-preview.1.7626 - 34.0.0-preview.1.148 - 16.2.227-net8-p1 - 16.2.227-net8-p1 - 13.1.227-net8-p1 - 16.1.1015-net8-p1 + 8.0.100-preview.2 + 8.0.0-preview.2.7871 + 34.0.0-preview.2.187 + 16.2.374-net8-p2 + 16.2.374-net8-p2 + 13.1.374-net8-p2 + 16.1.1162-net8-p2 8.0.0-preview.3.23167.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) From 37a41aef31f84a360e051d3da3765996b621286f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 20 Mar 2023 09:46:25 -0500 Subject: [PATCH 614/864] Add patch to address emsdk prebuilts (#15866) --- ...-netframework-targets-in-source-buil.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/SourceBuild/patches/emsdk/0001-Revert-Trim-away-netframework-targets-in-source-buil.patch diff --git a/src/SourceBuild/patches/emsdk/0001-Revert-Trim-away-netframework-targets-in-source-buil.patch b/src/SourceBuild/patches/emsdk/0001-Revert-Trim-away-netframework-targets-in-source-buil.patch new file mode 100644 index 000000000..fb7b31dca --- /dev/null +++ b/src/SourceBuild/patches/emsdk/0001-Revert-Trim-away-netframework-targets-in-source-buil.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Mon, 20 Mar 2023 13:42:30 +0000 +Subject: [PATCH] Revert "Trim away netframework targets in source-build + (#312)" + +This reverts commit 400fd9a71c568f3c7aa025c6224e082aa819a4c0. + +Backport: https://github.com/dotnet/source-build/issues/3336 +--- + eng/SourceBuild.props | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index c963035..c4009f3 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -3,7 +3,6 @@ + + emsdk + true +- true + + + From c3730935bc3a06db5d51e8f3f36d88b8056a2cb5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 20 Mar 2023 10:16:33 -0500 Subject: [PATCH 615/864] Add System.Common.Drawing prebuilt (#15868) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 510c2daf8..ec36c398f 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-12.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-13.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz From bed753ff47001e30324c452ab642bcb1b777bc98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 10:53:19 -0700 Subject: [PATCH 616/864] [release/6.0.4xx] Update dependencies from dotnet/arcade (#15836) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 10 ---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbd67aded..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,17 +37,12 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e926e9ad0..d30cb53aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cad08e19d..568b45eda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23114.5 + 6.0.0-beta.23167.1 diff --git a/global.json b/global.json index 85690be2c..5bd694fa0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.114", + "dotnet": "6.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" } } From 6b8dcc20a1bcf86ed12f43a1d352c007962664b2 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Mar 2023 14:07:20 -0700 Subject: [PATCH 617/864] Publish checksums (#15803) --- eng/Publishing.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 3d0751dd8..f564a94e3 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -78,12 +78,12 @@ - - - - - - + + + + + + Date: Mon, 20 Mar 2023 22:00:22 +0000 Subject: [PATCH 618/864] [main] Update dependencies from dotnet/sdk (#15865) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23168.2 to 8.0.0-preview.3.23170.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00c7055b5..a6ba825e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 50221a4d0f656e2e65f497aa912cd323b298dee0 + 1c1c32b62172bbf8cf666783ac575a8ad4f34418 - + https://github.com/dotnet/sdk - 50221a4d0f656e2e65f497aa912cd323b298dee0 + 1c1c32b62172bbf8cf666783ac575a8ad4f34418 - + https://github.com/dotnet/sdk - 50221a4d0f656e2e65f497aa912cd323b298dee0 + 1c1c32b62172bbf8cf666783ac575a8ad4f34418 - + https://github.com/dotnet/sdk - 50221a4d0f656e2e65f497aa912cd323b298dee0 + 1c1c32b62172bbf8cf666783ac575a8ad4f34418 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 2aec3816f9bbc0eda3261daa335a05ea0df31b9c + 61ce09105fe08a6b02783970d85712e859479f44 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 943853e81..17da54873 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23170.1 - 8.0.100-preview.3.23170.1 - 8.0.100-preview.3.23170.1 + 8.0.100-preview.3.23170.5 + 8.0.100-preview.3.23170.5 + 8.0.100-preview.3.23170.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23170.2 - 8.0.0-preview.3.23168.2 - 8.0.0-preview.3.23168.2 - 8.0.0-preview.3.23168.2 - 8.0.0-preview.3.23168.2 - 8.0.0-preview.3.23168.2 - 8.0.0-preview.3.23168.2 + 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.2 2.1.0 From 6576b45a25dcee3f199c9bac932441ddef11cb67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 22:17:05 +0000 Subject: [PATCH 619/864] Update dependencies from https://github.com/dotnet/sdk build 20230320.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23170.5 -> To Version 8.0.100-preview.3.23170.9 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-preview.3.23169.3 -> To Version 8.0.0-preview.3.23170.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ba825e0..559f865e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 61ce09105fe08a6b02783970d85712e859479f44 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 - + https://github.com/dotnet/aspnetcore - d482bf3f8eea8071fb89fe481a956c9b56ff1c74 + 7a4829de7a0995b1ccffabc8c8567a0193ebc669 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 1c1c32b62172bbf8cf666783ac575a8ad4f34418 + 24e84eacf9ce976f36c209321788fb0ce8ebb841 - + https://github.com/dotnet/sdk - 1c1c32b62172bbf8cf666783ac575a8ad4f34418 + 24e84eacf9ce976f36c209321788fb0ce8ebb841 - + https://github.com/dotnet/sdk - 1c1c32b62172bbf8cf666783ac575a8ad4f34418 + 24e84eacf9ce976f36c209321788fb0ce8ebb841 - + https://github.com/dotnet/sdk - 1c1c32b62172bbf8cf666783ac575a8ad4f34418 + 24e84eacf9ce976f36c209321788fb0ce8ebb841 @@ -156,9 +156,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - b9b418e95ed428961af59f3ee5883f37cf4b0004 + c835f7f2050bc8d7166ca5b2a6e750d434ba002a diff --git a/eng/Versions.props b/eng/Versions.props index feb5756b5..c72ecf668 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23169.3 - 8.0.0-preview.3.23169.3 - 8.0.0-preview.3.23169.3 - 8.0.0-preview.3.23169.3 - 8.0.0-preview.3.23169.3 - 8.0.0-preview.3.23169.3 - 8.0.0-preview.3.23169.3 + 8.0.0-preview.3.23170.11 + 8.0.0-preview.3.23170.11 + 8.0.0-preview.3.23170.11 + 8.0.0-preview.3.23170.11 + 8.0.0-preview.3.23170.11 + 8.0.0-preview.3.23170.11 + 8.0.0-preview.3.23170.11 0.2.0 - 8.0.100-preview.3.23170.5 - 8.0.100-preview.3.23170.5 - 8.0.100-preview.3.23170.5 + 8.0.100-preview.3.23170.9 + 8.0.100-preview.3.23170.9 + 8.0.100-preview.3.23170.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85ee83b70de7c92fe6bd4422fdc66b8b4b283227 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 22:38:13 +0000 Subject: [PATCH 620/864] Update dependencies from https://github.com/dotnet/sdk build 20230320.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23169.3 -> To Version 7.0.300-preview.23170.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23167.4 -> To Version 12.5.0-beta.23170.6 (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 2b934533d..891420c16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec - + https://github.com/dotnet/sdk - bc621fa963db1d094ddd298054d96cd8466343fa + 0dae489f4561317ea850978ecac7baa68f23f8ec @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 + 4adb17929e35014c5b9d51301c7406fc816bc4b0 - + https://github.com/dotnet/fsharp - 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 + 4adb17929e35014c5b9d51301c7406fc816bc4b0 diff --git a/eng/Versions.props b/eng/Versions.props index 924cac14d..ac9f8a85e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23169.3 - 7.0.300-preview.23169.3 - 7.0.300-preview.23169.3 + 7.0.300-preview.23170.10 + 7.0.300-preview.23170.10 + 7.0.300-preview.23170.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d02dedbebf5b04980fa0de82ed1ecc8efa85e57f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 23:16:20 +0000 Subject: [PATCH 621/864] Update dependencies from https://github.com/dotnet/sdk build 20230320.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23170.5 -> To Version 8.0.100-preview.3.23170.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-preview.3.23169.3 -> To Version 8.0.0-preview.3.23170.11 (parent: Microsoft.NET.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 559f865e2..f304cfdd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 24e84eacf9ce976f36c209321788fb0ce8ebb841 + 5e91237ed540678f43ec105586beb0bc1af5e3f6 - + https://github.com/dotnet/sdk - 24e84eacf9ce976f36c209321788fb0ce8ebb841 + 5e91237ed540678f43ec105586beb0bc1af5e3f6 - + https://github.com/dotnet/sdk - 24e84eacf9ce976f36c209321788fb0ce8ebb841 + 5e91237ed540678f43ec105586beb0bc1af5e3f6 - + https://github.com/dotnet/sdk - 24e84eacf9ce976f36c209321788fb0ce8ebb841 + 5e91237ed540678f43ec105586beb0bc1af5e3f6 diff --git a/eng/Versions.props b/eng/Versions.props index c72ecf668..ebede5b27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23170.9 - 8.0.100-preview.3.23170.9 - 8.0.100-preview.3.23170.9 + 8.0.100-preview.3.23170.15 + 8.0.100-preview.3.23170.15 + 8.0.100-preview.3.23170.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0679b0cb9d8d08f0fe6525ec5f747de95ab18058 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 20 Mar 2023 18:16:22 -0700 Subject: [PATCH 622/864] update branding for p4 --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index feb5756b5..ff0af3481 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview - 3 + 4 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -128,7 +128,7 @@ $(MicrosoftNETSdkPackageVersion.Split('.')[2]) $(MicrosoftNETSdkFeatureAndPatchVersion.Split('-')[0]) $(MicrosoftNETSdkFeatureAndPatchVersion.Substring(1)) - @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 4adb17929e35014c5b9d51301c7406fc816bc4b0 + 29cdad34b502e2720399765b63700954cc8a70cc - + https://github.com/dotnet/fsharp - 4adb17929e35014c5b9d51301c7406fc816bc4b0 + 29cdad34b502e2720399765b63700954cc8a70cc diff --git a/eng/Versions.props b/eng/Versions.props index ac9f8a85e..1e62cecfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23170.10 - 7.0.300-preview.23170.10 - 7.0.300-preview.23170.10 + 7.0.300-preview.23170.22 + 7.0.300-preview.23170.22 + 7.0.300-preview.23170.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 00358e483af5bd809669b48eaabd26a415955c59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 04:15:34 +0000 Subject: [PATCH 624/864] Update dependencies from https://github.com/dotnet/sdk build 20230320.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23170.10 -> To Version 7.0.300-preview.23170.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.23170.6 -> To Version 12.5.0-beta.23170.8 (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 5b51c3ced..d1e8e84f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 - + https://github.com/dotnet/sdk - aa2ce88d65096be2da4970e013139f4f7362090a + cfa60f9af1208d86a2581ff487966e1bf216b101 @@ -154,9 +154,9 @@ 60ea2f733cfcc78da965ab43cf040fe5c58800fb - + https://github.com/nuget/nuget.client - b9b418e95ed428961af59f3ee5883f37cf4b0004 + c835f7f2050bc8d7166ca5b2a6e750d434ba002a diff --git a/eng/Versions.props b/eng/Versions.props index 1e62cecfb..3b37ccaa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23170.22 - 7.0.300-preview.23170.22 - 7.0.300-preview.23170.22 + 7.0.300-preview.23170.25 + 7.0.300-preview.23170.25 + 7.0.300-preview.23170.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37b628ca32357ceb186caaa60e9122695141bf55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 05:41:46 +0000 Subject: [PATCH 625/864] [main] Update dependencies from dotnet/sdk (#15880) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23170.2 to 8.0.0-preview.3.23170.7 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f304cfdd6..36ab88bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 5e91237ed540678f43ec105586beb0bc1af5e3f6 + 256908ef99289e05901519dd247c21f42a81d578 - + https://github.com/dotnet/sdk - 5e91237ed540678f43ec105586beb0bc1af5e3f6 + 256908ef99289e05901519dd247c21f42a81d578 - + https://github.com/dotnet/sdk - 5e91237ed540678f43ec105586beb0bc1af5e3f6 + 256908ef99289e05901519dd247c21f42a81d578 - + https://github.com/dotnet/sdk - 5e91237ed540678f43ec105586beb0bc1af5e3f6 + 256908ef99289e05901519dd247c21f42a81d578 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 61ce09105fe08a6b02783970d85712e859479f44 + 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ebede5b27..60c91a23c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23170.15 - 8.0.100-preview.3.23170.15 - 8.0.100-preview.3.23170.15 + 8.0.100-preview.3.23170.24 + 8.0.100-preview.3.23170.24 + 8.0.100-preview.3.23170.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.7 - 8.0.0-preview.3.23170.2 - 8.0.0-preview.3.23170.2 - 8.0.0-preview.3.23170.2 - 8.0.0-preview.3.23170.2 - 8.0.0-preview.3.23170.2 - 8.0.0-preview.3.23170.2 + 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.7 2.1.0 From 5312cd412f42d1c59dab58bb00b6607e6cc68e1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 06:20:04 +0000 Subject: [PATCH 626/864] Update dependencies from https://github.com/dotnet/sdk build 20230320.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23170.24 -> To Version 8.0.100-preview.3.23170.29 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.3.23170.11 -> To Version 8.0.0-preview.4.23170.22 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36ab88bc7..970d23bbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb - + https://github.com/dotnet/aspnetcore - 7a4829de7a0995b1ccffabc8c8567a0193ebc669 + d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 256908ef99289e05901519dd247c21f42a81d578 + 2499ee9cc47dbee761c03dab6266e95026a2b664 - + https://github.com/dotnet/sdk - 256908ef99289e05901519dd247c21f42a81d578 + 2499ee9cc47dbee761c03dab6266e95026a2b664 - + https://github.com/dotnet/sdk - 256908ef99289e05901519dd247c21f42a81d578 + 2499ee9cc47dbee761c03dab6266e95026a2b664 - + https://github.com/dotnet/sdk - 256908ef99289e05901519dd247c21f42a81d578 + 2499ee9cc47dbee761c03dab6266e95026a2b664 diff --git a/eng/Versions.props b/eng/Versions.props index 60c91a23c..87bbe6e0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.3.23170.11 - 8.0.0-preview.3.23170.11 - 8.0.0-preview.3.23170.11 - 8.0.0-preview.3.23170.11 - 8.0.0-preview.3.23170.11 - 8.0.0-preview.3.23170.11 - 8.0.0-preview.3.23170.11 + 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23170.22 0.2.0 - 8.0.100-preview.3.23170.24 - 8.0.100-preview.3.23170.24 - 8.0.100-preview.3.23170.24 + 8.0.100-preview.3.23170.29 + 8.0.100-preview.3.23170.29 + 8.0.100-preview.3.23170.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0c7b390a26f9f6f461f7797eb4350a44d9f59cce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 06:51:40 +0000 Subject: [PATCH 627/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15869) [main] Update dependencies from dotnet/source-build-reference-packages - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-df6f239c-cf9c-407f-99bc-8bf74fd38749 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36ab88bc7..a6d2bfee8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - fdbe4632b67ee16bd1856417cda93fdbf84139ec + e1b6b6ae61a710e96f5278188379bb496318fae4 From 1cf6a455484e9c0ff7eacdaf10219935baeae7af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 07:51:26 +0000 Subject: [PATCH 628/864] Update dependencies from https://github.com/dotnet/sdk build 20230321.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.3.23170.29 -> To Version 8.0.100-preview.3.23171.1 --- 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 32a44ea3d..0b1db941c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 2499ee9cc47dbee761c03dab6266e95026a2b664 + 62346cb09e81cfa58ecef71fe24d77609ceaefdc - + https://github.com/dotnet/sdk - 2499ee9cc47dbee761c03dab6266e95026a2b664 + 62346cb09e81cfa58ecef71fe24d77609ceaefdc - + https://github.com/dotnet/sdk - 2499ee9cc47dbee761c03dab6266e95026a2b664 + 62346cb09e81cfa58ecef71fe24d77609ceaefdc - + https://github.com/dotnet/sdk - 2499ee9cc47dbee761c03dab6266e95026a2b664 + 62346cb09e81cfa58ecef71fe24d77609ceaefdc diff --git a/eng/Versions.props b/eng/Versions.props index 87bbe6e0c..cc2eb9386 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23170.29 - 8.0.100-preview.3.23170.29 - 8.0.100-preview.3.23170.29 + 8.0.100-preview.3.23171.1 + 8.0.100-preview.3.23171.1 + 8.0.100-preview.3.23171.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fba50935e902c7ee52ef115c356334218164be8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 08:21:43 +0000 Subject: [PATCH 629/864] Update dependencies from https://github.com/dotnet/sdk build 20230321.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23170.25 -> To Version 7.0.300-preview.23171.2 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23165-02 -> To Version 17.6.0-preview-23171-02 (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 d1e8e84f8..659b7992b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 - + https://github.com/dotnet/sdk - cfa60f9af1208d86a2581ff487966e1bf216b101 + 45406907645903f94d26e7abe814ec9393cf9014 @@ -149,9 +149,9 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - 60ea2f733cfcc78da965ab43cf040fe5c58800fb + b84faa7d0dfb42daedca5c244f73f0b07e1135d7 diff --git a/eng/Versions.props b/eng/Versions.props index 3b37ccaa3..1c04b8f63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23170.25 - 7.0.300-preview.23170.25 - 7.0.300-preview.23170.25 + 7.0.300-preview.23171.2 + 7.0.300-preview.23171.2 + 7.0.300-preview.23171.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7cc8a16794a5fca1b3a14d3c23c99a3a6dfaff5d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 21 Mar 2023 08:56:22 -0500 Subject: [PATCH 630/864] PVP workaround for system.drawing.common removal (#15876) --- src/SourceBuild/content/eng/Versions.props | 2 +- .../content/repo-projects/Directory.Build.targets | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index ec36c398f..9616506fa 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-13.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-14.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 3cbe99cc0..01788e38e 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -167,7 +167,13 @@ <_CurrentSourceBuiltPackages Include="$(SourceBuiltPackagesPath)*.nupkg" Exclude="$(SourceBuiltPackagesPath)*.symbols.nupkg" /> - <_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg" /> + + + <_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg" + Exclude="$(PrebuiltSourceBuiltPackagesPath)System.Drawing.Common*.nupkg" /> <_CurrentAdditionalAssetDirs Include="$(SourceBuiltToolsetDir)" Condition="Exists('$(SourceBuiltToolsetDir)')" /> From 757bcaf3721717411d5ea81ca5e962ffb8109226 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 18:02:37 +0000 Subject: [PATCH 631/864] [main] Update dependencies from dotnet/sdk (#15886) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23170.7 to 8.0.0-preview.3.23170.14 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b1db941c..000996567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 62346cb09e81cfa58ecef71fe24d77609ceaefdc + 9904199075e6e9335d8825159eb99316bbe8c241 - + https://github.com/dotnet/sdk - 62346cb09e81cfa58ecef71fe24d77609ceaefdc + 9904199075e6e9335d8825159eb99316bbe8c241 - + https://github.com/dotnet/sdk - 62346cb09e81cfa58ecef71fe24d77609ceaefdc + 9904199075e6e9335d8825159eb99316bbe8c241 - + https://github.com/dotnet/sdk - 62346cb09e81cfa58ecef71fe24d77609ceaefdc + 9904199075e6e9335d8825159eb99316bbe8c241 @@ -142,9 +142,9 @@ 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 059898f8c0dbea2c6d0ed2ff30bc1b584af6b439 + 7b651743dc951384f6c3d8455c88518022c7c3b9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d75770aa2..b3370dd52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.3.23171.1 - 8.0.100-preview.3.23171.1 - 8.0.100-preview.3.23171.1 + 8.0.100-preview.3.23171.3 + 8.0.100-preview.3.23171.3 + 8.0.100-preview.3.23171.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.7 - 8.0.0-preview.3.23170.7 - 8.0.0-preview.3.23170.7 - 8.0.0-preview.3.23170.7 - 8.0.0-preview.3.23170.7 - 8.0.0-preview.3.23170.7 + 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23170.14 2.1.0 From acc401b96ffc9b07658015e52fef76293bb193a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 18:07:42 +0000 Subject: [PATCH 632/864] [main] Update dependencies from dotnet/source-build-externals (#15887) [main] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 000996567..bb4ac2ca2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - dcd0eca339b5c64b5816c111f583c82062ce4c74 + 5b908e01f04e383883a6f69a03ebfb2b93b1c6a2 From c3575159095bdeee9aa02151da007d1ab1ded697 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 20:48:33 +0000 Subject: [PATCH 633/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15892) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb4ac2ca2..b99102b6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - e1b6b6ae61a710e96f5278188379bb496318fae4 + c0406eca1fc7bac699242e1f4de0b54e382a7020 From 0450da1eae463601e2f0917e45ac758338693ad7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 20:51:43 +0000 Subject: [PATCH 634/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15893) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 6.6.0-preview.3.54 to 6.6.0-preview.3.55 (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 659b7992b..59a1276a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 - + https://github.com/dotnet/sdk - 45406907645903f94d26e7abe814ec9393cf9014 + 390530ff3c6e034b43d22ef37126a900102e8c38 @@ -154,9 +154,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - c835f7f2050bc8d7166ca5b2a6e750d434ba002a + fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b diff --git a/eng/Versions.props b/eng/Versions.props index 1c04b8f63..2a6801399 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.2 - 7.0.300-preview.23171.2 - 7.0.300-preview.23171.2 + 7.0.300-preview.23171.16 + 7.0.300-preview.23171.16 + 7.0.300-preview.23171.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a2845b373936111cd294026a46733f4d1b6fb86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 21:00:53 +0000 Subject: [PATCH 635/864] [main] Update dependencies from dotnet/sdk (#15891) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.4.23170.22 to 8.0.0-preview.4.23171.1 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23167.4 to 12.5.0-beta.23170.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23167.4 to 7.0.300-beta.23170.8 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230223-05 to 17.6.0-preview-20230320-03 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23165-02 to 17.6.0-preview-23171-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.3.54 to 6.6.0-preview.3.55 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b99102b6d..d27d0f7d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 - + https://github.com/dotnet/aspnetcore - d96f4dad16b90c6f3d1ae7b349797827f2b8ffeb + f136052490cdf7f06dedc6868a246d27f6e43856 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 9904199075e6e9335d8825159eb99316bbe8c241 + 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff - + https://github.com/dotnet/sdk - 9904199075e6e9335d8825159eb99316bbe8c241 + 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff - + https://github.com/dotnet/sdk - 9904199075e6e9335d8825159eb99316bbe8c241 + 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff - + https://github.com/dotnet/sdk - 9904199075e6e9335d8825159eb99316bbe8c241 + 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff @@ -128,18 +128,18 @@ https://github.com/dotnet/wpf 5d596bd99a06466c7b7aa67f7f66b108abad809a - + https://github.com/dotnet/fsharp - 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 + 29cdad34b502e2720399765b63700954cc8a70cc - + https://github.com/dotnet/fsharp - 1075dfd55cba81b4da9bf61aa58650ffe9eb8592 + 29cdad34b502e2720399765b63700954cc8a70cc - + https://github.com/microsoft/vstest - 05c0c4c4f084782533443dfeae0f6627018c5b6a + 2d656fe2133f89248825419fb8ffac5505486906 @@ -151,14 +151,14 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - 60ea2f733cfcc78da965ab43cf040fe5c58800fb + b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - c835f7f2050bc8d7166ca5b2a6e750d434ba002a + fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b diff --git a/eng/Versions.props b/eng/Versions.props index b3370dd52..fd9617897 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23170.22 - 8.0.0-preview.4.23170.22 - 8.0.0-preview.4.23170.22 - 8.0.0-preview.4.23170.22 - 8.0.0-preview.4.23170.22 - 8.0.0-preview.4.23170.22 - 8.0.0-preview.4.23170.22 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 0.2.0 - 8.0.100-preview.3.23171.3 - 8.0.100-preview.3.23171.3 - 8.0.100-preview.3.23171.3 + 8.0.100-preview.4.23171.18 + 8.0.100-preview.4.23171.18 + 8.0.100-preview.4.23171.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -218,7 +218,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230223-05 + 17.6.0-preview-20230320-03 8.0.0-alpha.1.22557.12 From b413950a014a52fb66eb004c61630470b6f74fc3 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 21 Mar 2023 15:03:29 -0700 Subject: [PATCH 636/864] update installer table for 8 0 preview 3 --- README.md | 156 +++++++++++++++++++++++++++--------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/README.md b/README.md index 9d90ec040..4b942bb7c 100644 --- a/README.md +++ b/README.md @@ -162,20 +162,20 @@ Do not directly edit the table below. Use https://github.com/dotnet/installer/tr ### Table *Note* the 7.0.100 build will be finished internally. Below is the last public version available from that branch but is not fully updated with the final runtime. -| Platform | main
(8.0.x Runtime) | 8.0.1xx-preview2
(8.0-preview2 Runtime) | Release/7.0.3xx
(7.0.x Runtime) | +| Platform | main
(8.0.x Runtime) | 8.0.1xx-preview3
(8.0-preview3 Runtime) | Release/7.0.3xx
(7.0.x Runtime) | | :--------- | :----------: | :----------: | :----------: | -| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-8.0.1XX-preview2]][win-x64-version-8.0.1XX-preview2]
[Installer][win-x64-installer-8.0.1XX-preview2] - [Checksum][win-x64-installer-checksum-8.0.1XX-preview2]
[zip][win-x64-zip-8.0.1XX-preview2] - [Checksum][win-x64-zip-checksum-8.0.1XX-preview2] | [![][win-x64-badge-7.0.3XX]][win-x64-version-7.0.3XX]
[Installer][win-x64-installer-7.0.3XX] - [Checksum][win-x64-installer-checksum-7.0.3XX]
[zip][win-x64-zip-7.0.3XX] - [Checksum][win-x64-zip-checksum-7.0.3XX] | -| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-8.0.1XX-preview2]][win-x86-version-8.0.1XX-preview2]
[Installer][win-x86-installer-8.0.1XX-preview2] - [Checksum][win-x86-installer-checksum-8.0.1XX-preview2]
[zip][win-x86-zip-8.0.1XX-preview2] - [Checksum][win-x86-zip-checksum-8.0.1XX-preview2] | [![][win-x86-badge-7.0.3XX]][win-x86-version-7.0.3XX]
[Installer][win-x86-installer-7.0.3XX] - [Checksum][win-x86-installer-checksum-7.0.3XX]
[zip][win-x86-zip-7.0.3XX] - [Checksum][win-x86-zip-checksum-7.0.3XX] | +| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-8.0.1XX-preview3]][win-x64-version-8.0.1XX-preview3]
[Installer][win-x64-installer-8.0.1XX-preview3] - [Checksum][win-x64-installer-checksum-8.0.1XX-preview3]
[zip][win-x64-zip-8.0.1XX-preview3] - [Checksum][win-x64-zip-checksum-8.0.1XX-preview3] | [![][win-x64-badge-7.0.3XX]][win-x64-version-7.0.3XX]
[Installer][win-x64-installer-7.0.3XX] - [Checksum][win-x64-installer-checksum-7.0.3XX]
[zip][win-x64-zip-7.0.3XX] - [Checksum][win-x64-zip-checksum-7.0.3XX] | +| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-8.0.1XX-preview3]][win-x86-version-8.0.1XX-preview3]
[Installer][win-x86-installer-8.0.1XX-preview3] - [Checksum][win-x86-installer-checksum-8.0.1XX-preview3]
[zip][win-x86-zip-8.0.1XX-preview3] - [Checksum][win-x86-zip-checksum-8.0.1XX-preview3] | [![][win-x86-badge-7.0.3XX]][win-x86-version-7.0.3XX]
[Installer][win-x86-installer-7.0.3XX] - [Checksum][win-x86-installer-checksum-7.0.3XX]
[zip][win-x86-zip-7.0.3XX] - [Checksum][win-x86-zip-checksum-7.0.3XX] | | **Windows arm** | **N/A** | **N/A** | **N/A** | -| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-8.0.1XX-preview2]][win-arm64-version-8.0.1XX-preview2]
[Installer][win-arm64-installer-8.0.1XX-preview2] - [Checksum][win-arm64-installer-checksum-8.0.1XX-preview2]
[zip][win-arm64-zip-8.0.1XX-preview2] | [![][win-arm64-badge-7.0.3XX]][win-arm64-version-7.0.3XX]
[Installer][win-arm64-installer-7.0.3XX] - [Checksum][win-arm64-installer-checksum-7.0.3XX]
[zip][win-arm64-zip-7.0.3XX] | -| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-8.0.1XX-preview2]][osx-x64-version-8.0.1XX-preview2]
[Installer][osx-x64-installer-8.0.1XX-preview2] - [Checksum][osx-x64-installer-checksum-8.0.1XX-preview2]
[tar.gz][osx-x64-targz-8.0.1XX-preview2] - [Checksum][osx-x64-targz-checksum-8.0.1XX-preview2] | [![][osx-x64-badge-7.0.3XX]][osx-x64-version-7.0.3XX]
[Installer][osx-x64-installer-7.0.3XX] - [Checksum][osx-x64-installer-checksum-7.0.3XX]
[tar.gz][osx-x64-targz-7.0.3XX] - [Checksum][osx-x64-targz-checksum-7.0.3XX] | -| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-8.0.1XX-preview2]][osx-arm64-version-8.0.1XX-preview2]
[Installer][osx-arm64-installer-8.0.1XX-preview2] - [Checksum][osx-arm64-installer-checksum-8.0.1XX-preview2]
[tar.gz][osx-arm64-targz-8.0.1XX-preview2] - [Checksum][osx-arm64-targz-checksum-8.0.1XX-preview2] | [![][osx-arm64-badge-7.0.3XX]][osx-arm64-version-7.0.3XX]
[Installer][osx-arm64-installer-7.0.3XX] - [Checksum][osx-arm64-installer-checksum-7.0.3XX]
[tar.gz][osx-arm64-targz-7.0.3XX] - [Checksum][osx-arm64-targz-checksum-7.0.3XX] | -| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-8.0.1XX-preview2]][linux-version-8.0.1XX-preview2]
[DEB Installer][linux-DEB-installer-8.0.1XX-preview2] - [Checksum][linux-DEB-installer-checksum-8.0.1XX-preview2]
[RPM Installer][linux-RPM-installer-8.0.1XX-preview2] - [Checksum][linux-RPM-installer-checksum-8.0.1XX-preview2]
_see installer note below_1
[tar.gz][linux-targz-8.0.1XX-preview2] - [Checksum][linux-targz-checksum-8.0.1XX-preview2] | [![][linux-badge-7.0.3XX]][linux-version-7.0.3XX]
[DEB Installer][linux-DEB-installer-7.0.3XX] - [Checksum][linux-DEB-installer-checksum-7.0.3XX]
[RPM Installer][linux-RPM-installer-7.0.3XX] - [Checksum][linux-RPM-installer-checksum-7.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.3XX] - [Checksum][linux-targz-checksum-7.0.3XX] | -| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-8.0.1XX-preview2]][linux-arm-version-8.0.1XX-preview2]
[tar.gz][linux-arm-targz-8.0.1XX-preview2] - [Checksum][linux-arm-targz-checksum-8.0.1XX-preview2] | [![][linux-arm-badge-7.0.3XX]][linux-arm-version-7.0.3XX]
[tar.gz][linux-arm-targz-7.0.3XX] - [Checksum][linux-arm-targz-checksum-7.0.3XX] | -| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-8.0.1XX-preview2]][linux-arm64-version-8.0.1XX-preview2]
[tar.gz][linux-arm64-targz-8.0.1XX-preview2] - [Checksum][linux-arm64-targz-checksum-8.0.1XX-preview2] | [![][linux-arm64-badge-7.0.3XX]][linux-arm64-version-7.0.3XX]
[tar.gz][linux-arm64-targz-7.0.3XX] - [Checksum][linux-arm64-targz-checksum-7.0.3XX] | -| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-8.0.1XX-preview2]][linux-musl-x64-version-8.0.1XX-preview2]
[tar.gz][linux-musl-x64-targz-8.0.1XX-preview2] - [Checksum][linux-musl-x64-targz-checksum-8.0.1XX-preview2] | [![][linux-musl-x64-badge-7.0.3XX]][linux-musl-x64-version-7.0.3XX]
[tar.gz][linux-musl-x64-targz-7.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.3XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-8.0.1XX-preview2]][linux-musl-arm-version-8.0.1XX-preview2]
[tar.gz][linux-musl-arm-targz-8.0.1XX-preview2] - [Checksum][linux-musl-arm-targz-checksum-8.0.1XX-preview2] | [![][linux-musl-arm-badge-7.0.3XX]][linux-musl-arm-version-7.0.3XX]
[tar.gz][linux-musl-arm-targz-7.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.3XX] | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-8.0.1XX-preview2]][linux-musl-arm64-version-8.0.1XX-preview2]
[tar.gz][linux-musl-arm64-targz-8.0.1XX-preview2] - [Checksum][linux-musl-arm64-targz-checksum-8.0.1XX-preview2] | [![][linux-musl-arm64-badge-7.0.3XX]][linux-musl-arm64-version-7.0.3XX]
[tar.gz][linux-musl-arm64-targz-7.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.3XX] | +| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-8.0.1XX-preview3]][win-arm64-version-8.0.1XX-preview3]
[Installer][win-arm64-installer-8.0.1XX-preview3] - [Checksum][win-arm64-installer-checksum-8.0.1XX-preview3]
[zip][win-arm64-zip-8.0.1XX-preview3] | [![][win-arm64-badge-7.0.3XX]][win-arm64-version-7.0.3XX]
[Installer][win-arm64-installer-7.0.3XX] - [Checksum][win-arm64-installer-checksum-7.0.3XX]
[zip][win-arm64-zip-7.0.3XX] | +| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-8.0.1XX-preview3]][osx-x64-version-8.0.1XX-preview3]
[Installer][osx-x64-installer-8.0.1XX-preview3] - [Checksum][osx-x64-installer-checksum-8.0.1XX-preview3]
[tar.gz][osx-x64-targz-8.0.1XX-preview3] - [Checksum][osx-x64-targz-checksum-8.0.1XX-preview3] | [![][osx-x64-badge-7.0.3XX]][osx-x64-version-7.0.3XX]
[Installer][osx-x64-installer-7.0.3XX] - [Checksum][osx-x64-installer-checksum-7.0.3XX]
[tar.gz][osx-x64-targz-7.0.3XX] - [Checksum][osx-x64-targz-checksum-7.0.3XX] | +| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-8.0.1XX-preview3]][osx-arm64-version-8.0.1XX-preview3]
[Installer][osx-arm64-installer-8.0.1XX-preview3] - [Checksum][osx-arm64-installer-checksum-8.0.1XX-preview3]
[tar.gz][osx-arm64-targz-8.0.1XX-preview3] - [Checksum][osx-arm64-targz-checksum-8.0.1XX-preview3] | [![][osx-arm64-badge-7.0.3XX]][osx-arm64-version-7.0.3XX]
[Installer][osx-arm64-installer-7.0.3XX] - [Checksum][osx-arm64-installer-checksum-7.0.3XX]
[tar.gz][osx-arm64-targz-7.0.3XX] - [Checksum][osx-arm64-targz-checksum-7.0.3XX] | +| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-8.0.1XX-preview3]][linux-version-8.0.1XX-preview3]
[DEB Installer][linux-DEB-installer-8.0.1XX-preview3] - [Checksum][linux-DEB-installer-checksum-8.0.1XX-preview3]
[RPM Installer][linux-RPM-installer-8.0.1XX-preview3] - [Checksum][linux-RPM-installer-checksum-8.0.1XX-preview3]
_see installer note below_1
[tar.gz][linux-targz-8.0.1XX-preview3] - [Checksum][linux-targz-checksum-8.0.1XX-preview3] | [![][linux-badge-7.0.3XX]][linux-version-7.0.3XX]
[DEB Installer][linux-DEB-installer-7.0.3XX] - [Checksum][linux-DEB-installer-checksum-7.0.3XX]
[RPM Installer][linux-RPM-installer-7.0.3XX] - [Checksum][linux-RPM-installer-checksum-7.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.3XX] - [Checksum][linux-targz-checksum-7.0.3XX] | +| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-8.0.1XX-preview3]][linux-arm-version-8.0.1XX-preview3]
[tar.gz][linux-arm-targz-8.0.1XX-preview3] - [Checksum][linux-arm-targz-checksum-8.0.1XX-preview3] | [![][linux-arm-badge-7.0.3XX]][linux-arm-version-7.0.3XX]
[tar.gz][linux-arm-targz-7.0.3XX] - [Checksum][linux-arm-targz-checksum-7.0.3XX] | +| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-8.0.1XX-preview3]][linux-arm64-version-8.0.1XX-preview3]
[tar.gz][linux-arm64-targz-8.0.1XX-preview3] - [Checksum][linux-arm64-targz-checksum-8.0.1XX-preview3] | [![][linux-arm64-badge-7.0.3XX]][linux-arm64-version-7.0.3XX]
[tar.gz][linux-arm64-targz-7.0.3XX] - [Checksum][linux-arm64-targz-checksum-7.0.3XX] | +| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-8.0.1XX-preview3]][linux-musl-x64-version-8.0.1XX-preview3]
[tar.gz][linux-musl-x64-targz-8.0.1XX-preview3] - [Checksum][linux-musl-x64-targz-checksum-8.0.1XX-preview3] | [![][linux-musl-x64-badge-7.0.3XX]][linux-musl-x64-version-7.0.3XX]
[tar.gz][linux-musl-x64-targz-7.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.3XX] | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-8.0.1XX-preview3]][linux-musl-arm-version-8.0.1XX-preview3]
[tar.gz][linux-musl-arm-targz-8.0.1XX-preview3] - [Checksum][linux-musl-arm-targz-checksum-8.0.1XX-preview3] | [![][linux-musl-arm-badge-7.0.3XX]][linux-musl-arm-version-7.0.3XX]
[tar.gz][linux-musl-arm-targz-7.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.3XX] | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-8.0.1XX-preview3]][linux-musl-arm64-version-8.0.1XX-preview3]
[tar.gz][linux-musl-arm64-targz-8.0.1XX-preview3] - [Checksum][linux-musl-arm64-targz-checksum-8.0.1XX-preview3] | [![][linux-musl-arm64-badge-7.0.3XX]][linux-musl-arm64-version-7.0.3XX]
[tar.gz][linux-musl-arm64-targz-7.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.3XX] | | **RHEL 6** | **N/A** | **N/A** | **N/A** | Reference notes: @@ -192,12 +192,12 @@ Reference notes: [win-x64-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x64.zip [win-x64-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x64.zip.sha -[win-x64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_x64_Release_version_badge.svg?no-cache -[win-x64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-x64.txt -[win-x64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.exe -[win-x64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.exe.sha -[win-x64-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.zip -[win-x64-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x64.zip.sha +[win-x64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/win_x64_Release_version_badge.svg?no-cache +[win-x64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-win-x64.txt +[win-x64-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x64.exe +[win-x64-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x64.exe.sha +[win-x64-zip-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x64.zip +[win-x64-zip-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x64.zip.sha [win-x64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_x64_Release_version_badge.svg?no-cache [win-x64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-x64.txt @@ -213,12 +213,12 @@ Reference notes: [win-x86-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x86.zip [win-x86-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-x86.zip.sha -[win-x86-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_x86_Release_version_badge.svg?no-cache -[win-x86-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-x86.txt -[win-x86-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.exe -[win-x86-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.exe.sha -[win-x86-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.zip -[win-x86-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-x86.zip.sha +[win-x86-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/win_x86_Release_version_badge.svg?no-cache +[win-x86-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-win-x86.txt +[win-x86-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x86.exe +[win-x86-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x86.exe.sha +[win-x86-zip-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x86.zip +[win-x86-zip-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-x86.zip.sha [win-x86-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_x86_Release_version_badge.svg?no-cache [win-x86-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-x86.txt @@ -234,12 +234,12 @@ Reference notes: [osx-x64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz [osx-x64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha -[osx-x64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/osx_x64_Release_version_badge.svg?no-cache -[osx-x64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-osx-x64.txt -[osx-x64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg -[osx-x64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg.sha -[osx-x64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.tar.gz -[osx-x64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha +[osx-x64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/osx_x64_Release_version_badge.svg?no-cache +[osx-x64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-osx-x64.txt +[osx-x64-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-x64.pkg +[osx-x64-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-x64.pkg.sha +[osx-x64-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-x64.tar.gz +[osx-x64-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha [osx-x64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/osx_x64_Release_version_badge.svg?no-cache [osx-x64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-osx-x64.txt @@ -255,12 +255,12 @@ Reference notes: [osx-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz [osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha -[osx-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/osx_arm64_Release_version_badge.svg?no-cache -[osx-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-osx-arm64.txt -[osx-arm64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg -[osx-arm64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg.sha -[osx-arm64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.tar.gz -[osx-arm64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha +[osx-arm64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/osx_arm64_Release_version_badge.svg?no-cache +[osx-arm64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-osx-arm64.txt +[osx-arm64-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-arm64.pkg +[osx-arm64-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-arm64.pkg.sha +[osx-arm64-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-arm64.tar.gz +[osx-arm64-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha [osx-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/osx_arm64_Release_version_badge.svg?no-cache [osx-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-osx-arm64.txt @@ -278,14 +278,14 @@ Reference notes: [linux-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz [linux-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha -[linux-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_x64_Release_version_badge.svg?no-cache -[linux-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-x64.txt -[linux-DEB-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.deb -[linux-DEB-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.deb.sha -[linux-RPM-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.rpm -[linux-RPM-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-x64.rpm.sha -[linux-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-x64.tar.gz -[linux-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-x64.tar.gz.sha +[linux-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/linux_x64_Release_version_badge.svg?no-cache +[linux-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-linux-x64.txt +[linux-DEB-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-x64.deb +[linux-DEB-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-x64.deb.sha +[linux-RPM-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-x64.rpm +[linux-RPM-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-x64.rpm.sha +[linux-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-x64.tar.gz +[linux-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-x64.tar.gz.sha [linux-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_x64_Release_version_badge.svg?no-cache [linux-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-x64.txt @@ -301,10 +301,10 @@ Reference notes: [linux-arm-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz [linux-arm-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha -[linux-arm-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_arm_Release_version_badge.svg?no-cache -[linux-arm-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-arm.txt -[linux-arm-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm.tar.gz -[linux-arm-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm.tar.gz.sha +[linux-arm-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/linux_arm_Release_version_badge.svg?no-cache +[linux-arm-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-linux-arm.txt +[linux-arm-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-arm.tar.gz +[linux-arm-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-arm.tar.gz.sha [linux-arm-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_arm_Release_version_badge.svg?no-cache [linux-arm-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-arm.txt @@ -316,10 +316,10 @@ Reference notes: [linux-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz [linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha -[linux-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_arm64_Release_version_badge.svg?no-cache -[linux-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-arm64.txt -[linux-arm64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm64.tar.gz -[linux-arm64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-arm64.tar.gz.sha +[linux-arm64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/linux_arm64_Release_version_badge.svg?no-cache +[linux-arm64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-linux-arm64.txt +[linux-arm64-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-arm64.tar.gz +[linux-arm64-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-arm64.tar.gz.sha [linux-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_arm64_Release_version_badge.svg?no-cache [linux-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-arm64.txt @@ -331,10 +331,10 @@ Reference notes: [rhel-6-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz [rhel-6-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha -[rhel-6-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/rhel.6_x64_Release_version_badge.svg?no-cache -[rhel-6-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-rhel.6-x64.txt -[rhel-6-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-rhel.6-x64.tar.gz -[rhel-6-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha +[rhel-6-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/rhel.6_x64_Release_version_badge.svg?no-cache +[rhel-6-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-rhel.6-x64.txt +[rhel-6-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha [rhel-6-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache [rhel-6-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-rhel.6-x64.txt @@ -346,10 +346,10 @@ Reference notes: [linux-musl-x64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz [linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha -[linux-musl-x64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_musl_x64_Release_version_badge.svg?no-cache -[linux-musl-x64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-musl-x64.txt -[linux-musl-x64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-x64.tar.gz -[linux-musl-x64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha +[linux-musl-x64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/linux_musl_x64_Release_version_badge.svg?no-cache +[linux-musl-x64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-linux-musl-x64.txt +[linux-musl-x64-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-musl-x64.tar.gz +[linux-musl-x64-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha [linux-musl-x64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache [linux-musl-x64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-musl-x64.txt @@ -361,10 +361,10 @@ Reference notes: [linux-musl-arm-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha -[linux-musl-arm-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_musl_arm_Release_version_badge.svg?no-cache -[linux-musl-arm-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-musl-arm.txt -[linux-musl-arm-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm.tar.gz -[linux-musl-arm-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/linux_musl_arm_Release_version_badge.svg?no-cache +[linux-musl-arm-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha [linux-musl-arm-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_musl_arm_Release_version_badge.svg?no-cache [linux-musl-arm-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-musl-arm.txt @@ -376,10 +376,10 @@ Reference notes: [linux-musl-arm64-targz-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha -[linux-musl-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/linux_musl_arm64_Release_version_badge.svg?no-cache -[linux-musl-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-linux-musl-arm64.txt -[linux-musl-arm64-targz-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm64.tar.gz -[linux-musl-arm64-targz-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/linux_musl_arm64_Release_version_badge.svg?no-cache +[linux-musl-arm64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha [linux-musl-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/linux_musl_arm64_Release_version_badge.svg?no-cache [linux-musl-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-linux-musl-arm64.txt @@ -391,10 +391,10 @@ Reference notes: [win-arm-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm.zip [win-arm-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm.zip.sha -[win-arm-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_arm_Release_version_badge.svg?no-cache -[win-arm-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-arm.txt -[win-arm-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm.zip -[win-arm-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm.zip.sha +[win-arm-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/win_arm_Release_version_badge.svg?no-cache +[win-arm-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-win-arm.txt +[win-arm-zip-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-arm.zip +[win-arm-zip-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-arm.zip.sha [win-arm-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_arm_Release_version_badge.svg?no-cache [win-arm-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-arm.txt @@ -408,12 +408,12 @@ Reference notes: [win-arm64-zip-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm64.zip [win-arm64-zip-checksum-main]: https://aka.ms/dotnet/8.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha -[win-arm64-badge-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/win_arm64_Release_version_badge.svg?no-cache -[win-arm64-version-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/productCommit-win-arm64.txt -[win-arm64-installer-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.exe -[win-arm64-installer-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.exe.sha -[win-arm64-zip-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.zip -[win-arm64-zip-checksum-8.0.1XX-preview2]: https://aka.ms/dotnet/8.0.1xx-preview2/daily/dotnet-sdk-win-arm64.zip.sha +[win-arm64-badge-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/win_arm64_Release_version_badge.svg?no-cache +[win-arm64-version-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/productCommit-win-arm64.txt +[win-arm64-installer-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-arm64.exe +[win-arm64-installer-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-arm64.exe.sha +[win-arm64-zip-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-arm64.zip +[win-arm64-zip-checksum-8.0.1XX-preview3]: https://aka.ms/dotnet/8.0.1xx-preview3/daily/dotnet-sdk-win-arm64.zip.sha [win-arm64-badge-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/win_arm64_Release_version_badge.svg?no-cache [win-arm64-version-7.0.3XX]: https://aka.ms/dotnet/7.0.3xx/daily/productCommit-win-arm64.txt From c1c4b1ebfa260a492829b27e94a7ad70515afb73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 22:37:29 +0000 Subject: [PATCH 637/864] [main] Update dependencies from dotnet/sdk (#15895) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23170.14 to 8.0.0-preview.3.23171.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d27d0f7d2..293080146 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + c1acb35ce2b90f241ccdf3ead79544516c673e5f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index fd9617897..b4a5c3496 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23171.18 - 8.0.100-preview.4.23171.18 - 8.0.100-preview.4.23171.18 + 8.0.100-preview.4.23171.22 + 8.0.100-preview.4.23171.22 + 8.0.100-preview.4.23171.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23171.3 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.3 2.1.0 From 2fd81d2ad030f2413260ed3c180b061e63216a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Mar 2023 23:12:53 +0000 Subject: [PATCH 638/864] Update dependencies from https://github.com/dotnet/sdk build 20230321.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23171.16 -> To Version 7.0.300-preview.23171.26 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23170.8 -> To Version 12.5.0-beta.23171.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59a1276a8..68d8ac251 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 - + https://github.com/dotnet/sdk - 390530ff3c6e034b43d22ef37126a900102e8c38 + 04ede91859fd1606070d590f5440404e236dcc27 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 29cdad34b502e2720399765b63700954cc8a70cc + 759352037893d79516181a8a3f996a6207e384e8 - + https://github.com/dotnet/fsharp - 29cdad34b502e2720399765b63700954cc8a70cc + 759352037893d79516181a8a3f996a6207e384e8 @@ -144,7 +144,7 @@ linker - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index 2a6801399..f901e56f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.16 - 7.0.300-preview.23171.16 - 7.0.300-preview.23171.16 + 7.0.300-preview.23171.26 + 7.0.300-preview.23171.26 + 7.0.300-preview.23171.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74d1b866777a78b7e4089ee438ae7686fa9112c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 01:48:46 +0000 Subject: [PATCH 639/864] Update dependencies from https://github.com/dotnet/sdk build 20230321.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23171.16 -> To Version 7.0.300-preview.23171.36 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23170.8 -> To Version 12.5.0-beta.23171.4 (parent: Microsoft.NET.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 68d8ac251..2278a7b8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c - + https://github.com/dotnet/sdk - 04ede91859fd1606070d590f5440404e236dcc27 + 4b2a65ab5790ee906fed3391e68db916c297f77c diff --git a/eng/Versions.props b/eng/Versions.props index f901e56f5..db070e642 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.26 - 7.0.300-preview.23171.26 - 7.0.300-preview.23171.26 + 7.0.300-preview.23171.36 + 7.0.300-preview.23171.36 + 7.0.300-preview.23171.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0109ac477975eca43c2dffdf3f5e6caffae2438 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:49:14 +1100 Subject: [PATCH 640/864] [main] Update dependencies from dotnet/sdk (#15899) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 293080146..129258eab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb + e3b39b8db045f14193a29726cb193cea8913e0dc - + https://github.com/dotnet/sdk - 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb + e3b39b8db045f14193a29726cb193cea8913e0dc - + https://github.com/dotnet/sdk - 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb + e3b39b8db045f14193a29726cb193cea8913e0dc - + https://github.com/dotnet/sdk - 09d8fec0cd3cfd622fa8e53dba5509d6decd2deb + e3b39b8db045f14193a29726cb193cea8913e0dc @@ -142,11 +142,11 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - c1acb35ce2b90f241ccdf3ead79544516c673e5f + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index b4a5c3496..110ed11e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,42 +65,42 @@ - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.4 0.2.0 - 8.0.100-preview.4.23171.22 - 8.0.100-preview.4.23171.22 - 8.0.100-preview.4.23171.22 + 8.0.100-preview.4.23171.32 + 8.0.100-preview.4.23171.32 + 8.0.100-preview.4.23171.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-2.23166.9 + 4.6.0-2.23171.5 - 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23171.3 - 8.0.0-preview.3.23171.3 - 8.0.0-preview.3.23171.3 - 8.0.0-preview.3.23171.3 - 8.0.0-preview.3.23171.3 - 8.0.0-preview.3.23171.3 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 2.1.0 From cf523954d87f620fc0c23f49c6caaf0060ab73d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 06:32:02 +0000 Subject: [PATCH 641/864] Update dependencies from https://github.com/dotnet/sdk build 20230321.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23171.32 -> To Version 8.0.100-preview.4.23171.39 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.4.23171.4 -> To Version 8.0.0-preview.4.23171.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 129258eab..ef72fe70b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - 5eac493dc97d1df6591b8dab3647f36a8d7d2f9a + 16907a1efa1b53ea0c91984f90d8cef314fb4420 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - e3b39b8db045f14193a29726cb193cea8913e0dc + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae - + https://github.com/dotnet/sdk - e3b39b8db045f14193a29726cb193cea8913e0dc + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae - + https://github.com/dotnet/sdk - e3b39b8db045f14193a29726cb193cea8913e0dc + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae - + https://github.com/dotnet/sdk - e3b39b8db045f14193a29726cb193cea8913e0dc + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae diff --git a/eng/Versions.props b/eng/Versions.props index 110ed11e6..71edac1b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23171.4 - 8.0.0-preview.4.23171.4 - 8.0.0-preview.4.23171.4 - 8.0.0-preview.4.23171.4 - 8.0.0-preview.4.23171.4 - 8.0.0-preview.4.23171.4 - 8.0.0-preview.4.23171.4 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 0.2.0 - 8.0.100-preview.4.23171.32 - 8.0.100-preview.4.23171.32 - 8.0.100-preview.4.23171.32 + 8.0.100-preview.4.23171.39 + 8.0.100-preview.4.23171.39 + 8.0.100-preview.4.23171.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8de14ffe549c2d733f4ed492cc5686190ea14ee6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 08:35:31 +0000 Subject: [PATCH 642/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23171.36 -> To Version 7.0.300-preview.23172.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23171.4 -> To Version 12.5.0-beta.23171.5 (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 2278a7b8a..8fc949c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 - + https://github.com/dotnet/sdk - 4b2a65ab5790ee906fed3391e68db916c297f77c + 5648fadae1f07a92ee738a307f835f6f5c1da086 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 759352037893d79516181a8a3f996a6207e384e8 + fa42aff3113ee163cde64511ee8d0128cf9ea3aa - + https://github.com/dotnet/fsharp - 759352037893d79516181a8a3f996a6207e384e8 + fa42aff3113ee163cde64511ee8d0128cf9ea3aa diff --git a/eng/Versions.props b/eng/Versions.props index db070e642..6eda8b859 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23171.36 - 7.0.300-preview.23171.36 - 7.0.300-preview.23171.36 + 7.0.300-preview.23172.1 + 7.0.300-preview.23172.1 + 7.0.300-preview.23172.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8412e24c38f0e515466d81e704e40661dee41a3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 12:18:59 +0000 Subject: [PATCH 643/864] Update dependencies from https://github.com/dotnet/arcade build 20230321.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23168.1 -> To Version 8.0.0-beta.23171.2 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23165-02 -> To Version 1.2.0-beta-23170-01 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef72fe70b..91d3325ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - b12f035e893c34ec2c965d75f6e21b7a2667e98d + b17c4b8af95a9652c3501df2702913ca94adb139 - + https://github.com/dotnet/arcade - b12f035e893c34ec2c965d75f6e21b7a2667e98d + b17c4b8af95a9652c3501df2702913ca94adb139 - + https://github.com/dotnet/arcade - b12f035e893c34ec2c965d75f6e21b7a2667e98d + b17c4b8af95a9652c3501df2702913ca94adb139 https://github.com/dotnet/arcade-services @@ -217,14 +217,14 @@ c0406eca1fc7bac699242e1f4de0b54e382a7020 - + https://github.com/dotnet/sourcelink - 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 + 7c8e17b66d9d3741b3c6226757622fd729b13df2 - + https://github.com/dotnet/xliff-tasks - b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 + 599baeb23fc6d6ca5e693822c422cabd6daa2c4c diff --git a/eng/Versions.props b/eng/Versions.props index 71edac1b1..61e741a64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23168.1 + 8.0.0-beta.23171.2 diff --git a/global.json b/global.json index c6817ae56..2d860da02 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23168.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23168.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23171.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23171.2" } } From cfebb39cd336df2ad92a42c1587f523bbc0f5ac6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 12:31:58 +0000 Subject: [PATCH 644/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230321.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23170.3 -> To Version 8.0.0-alpha.1.23171.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef72fe70b..7a8cb6d8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,9 +175,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 5b908e01f04e383883a6f69a03ebfb2b93b1c6a2 + 4b8fe3ff0cfb2b38901803c798c647ca8123c222 From 6dc8f5b00ba313167028bf47e461af71af880381 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 22 Mar 2023 10:02:16 -0500 Subject: [PATCH 645/864] Update SB version info for 8.0 Preview 2 release (#15889) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- ...ch-to-self-hosted-NativeAOT-compiler.patch | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 9616506fa..56601bc3a 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-14.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 3d6c8c8ee..e59da05d1 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23080.2" + "dotnet": "8.0.100-preview.2.23157.25" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch b/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch new file mode 100644 index 000000000..6f944b67b --- /dev/null +++ b/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Mon, 20 Mar 2023 15:35:53 -0500 +Subject: [PATCH] Revert switch to self-hosted NativeAOT compiler + +Backport: https://github.com/dotnet/runtime/issues/83695 +--- + src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +index db48433db73..982bbc78427 100644 +--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj ++++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +@@ -12,6 +12,7 @@ + $(RuntimeBinDir)ilc-published/ + false + false ++ false + true + true + true From c2a53d2b35f0c735b9de88911a84eef56d939cc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 15:59:25 +0000 Subject: [PATCH 646/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23171.39 -> To Version 8.0.100-preview.4.23172.5 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23171.4 -> To Version 8.0.0-preview.4.23172.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++--------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef72fe70b..f45f7f675 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae + 4250369416a9bf829c10382015246f1fabe35e7c - + https://github.com/dotnet/sdk - 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae + 4250369416a9bf829c10382015246f1fabe35e7c - + https://github.com/dotnet/sdk - 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae + 4250369416a9bf829c10382015246f1fabe35e7c - + https://github.com/dotnet/sdk - 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae + 4250369416a9bf829c10382015246f1fabe35e7c @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - edb161ab06ddc69d27aee2c0e990a60221ebbe92 + 7500625bd9303a48d0500b6123cec604e49039ae https://github.com/dotnet/roslyn @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 25d9f7a5e38a2d61b94ff341bc0d32135fcb15f9 + a464820353b7956538b07c9b53103d793b5e15b6 diff --git a/eng/Versions.props b/eng/Versions.props index 71edac1b1..e068adfb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23171.39 - 8.0.100-preview.4.23171.39 - 8.0.100-preview.4.23171.39 + 8.0.100-preview.4.23172.5 + 8.0.100-preview.4.23172.5 + 8.0.100-preview.4.23172.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.3.23171.4 + 8.0.0-preview.4.23172.1 - 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23171.4 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 2.1.0 @@ -231,7 +231,7 @@ 13.1.374-net8-p2 16.1.1162-net8-p2 - 8.0.0-preview.3.23167.1 + 8.0.0-preview.4.23170.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From d2c8eb928b9469cc8beeff10ceeca0b34d998e54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 18:29:18 +0000 Subject: [PATCH 647/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23171.39 -> To Version 8.0.100-preview.4.23172.13 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23171.4 -> To Version 8.0.0-preview.4.23172.1 (parent: Microsoft.NET.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 f45f7f675..59d3772be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 4250369416a9bf829c10382015246f1fabe35e7c + 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f - + https://github.com/dotnet/sdk - 4250369416a9bf829c10382015246f1fabe35e7c + 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f - + https://github.com/dotnet/sdk - 4250369416a9bf829c10382015246f1fabe35e7c + 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f - + https://github.com/dotnet/sdk - 4250369416a9bf829c10382015246f1fabe35e7c + 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f diff --git a/eng/Versions.props b/eng/Versions.props index e068adfb1..942861f86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.5 - 8.0.100-preview.4.23172.5 - 8.0.100-preview.4.23172.5 + 8.0.100-preview.4.23172.13 + 8.0.100-preview.4.23172.13 + 8.0.100-preview.4.23172.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8edb110faf81335c6a2b238cd893cdc2fd7084fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 19:54:56 +0000 Subject: [PATCH 648/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23171.39 -> To Version 8.0.100-preview.4.23172.18 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23171.4 -> To Version 8.0.0-preview.4.23172.1 (parent: Microsoft.NET.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 59d3772be..283097fd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f + e2d5c14f63456693e4d3ec825452300e69990478 - + https://github.com/dotnet/sdk - 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f + e2d5c14f63456693e4d3ec825452300e69990478 - + https://github.com/dotnet/sdk - 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f + e2d5c14f63456693e4d3ec825452300e69990478 - + https://github.com/dotnet/sdk - 365a2b79a0bb98dd58f69052b6a4aaf1d1a9784f + e2d5c14f63456693e4d3ec825452300e69990478 diff --git a/eng/Versions.props b/eng/Versions.props index 942861f86..3031be6e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.13 - 8.0.100-preview.4.23172.13 - 8.0.100-preview.4.23172.13 + 8.0.100-preview.4.23172.18 + 8.0.100-preview.4.23172.18 + 8.0.100-preview.4.23172.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8aeb7ee8bc939083aa06fc165ffca61a2b2fe1d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 21:00:07 +0000 Subject: [PATCH 649/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23171.39 -> To Version 8.0.100-preview.4.23172.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23171.4 -> To Version 8.0.0-preview.4.23172.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 283097fd0..ab94af3e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - e2d5c14f63456693e4d3ec825452300e69990478 + f023125511e0f37409e22cffb1422d32c42487c6 - + https://github.com/dotnet/sdk - e2d5c14f63456693e4d3ec825452300e69990478 + f023125511e0f37409e22cffb1422d32c42487c6 - + https://github.com/dotnet/sdk - e2d5c14f63456693e4d3ec825452300e69990478 + f023125511e0f37409e22cffb1422d32c42487c6 - + https://github.com/dotnet/sdk - e2d5c14f63456693e4d3ec825452300e69990478 + f023125511e0f37409e22cffb1422d32c42487c6 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 5d596bd99a06466c7b7aa67f7f66b108abad809a - + https://github.com/dotnet/fsharp - 29cdad34b502e2720399765b63700954cc8a70cc + fa42aff3113ee163cde64511ee8d0128cf9ea3aa - + https://github.com/dotnet/fsharp - 29cdad34b502e2720399765b63700954cc8a70cc + fa42aff3113ee163cde64511ee8d0128cf9ea3aa diff --git a/eng/Versions.props b/eng/Versions.props index 3031be6e7..7c1dcd7eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.18 - 8.0.100-preview.4.23172.18 - 8.0.100-preview.4.23172.18 + 8.0.100-preview.4.23172.19 + 8.0.100-preview.4.23172.19 + 8.0.100-preview.4.23172.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4228dc826b93dd8e2ecad09a4a228fab1baf19d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Mar 2023 21:39:56 +0000 Subject: [PATCH 650/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23171.39 -> To Version 8.0.100-preview.4.23172.20 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.3.23171.4 -> To Version 8.0.0-preview.4.23172.1 (parent: Microsoft.NET.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 ab94af3e5..f88ea3270 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - f023125511e0f37409e22cffb1422d32c42487c6 + 6f9dc3a890cf308dbb7f16a061dce8b66987b11a - + https://github.com/dotnet/sdk - f023125511e0f37409e22cffb1422d32c42487c6 + 6f9dc3a890cf308dbb7f16a061dce8b66987b11a - + https://github.com/dotnet/sdk - f023125511e0f37409e22cffb1422d32c42487c6 + 6f9dc3a890cf308dbb7f16a061dce8b66987b11a - + https://github.com/dotnet/sdk - f023125511e0f37409e22cffb1422d32c42487c6 + 6f9dc3a890cf308dbb7f16a061dce8b66987b11a diff --git a/eng/Versions.props b/eng/Versions.props index 7c1dcd7eb..c8404f1a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.19 - 8.0.100-preview.4.23172.19 - 8.0.100-preview.4.23172.19 + 8.0.100-preview.4.23172.20 + 8.0.100-preview.4.23172.20 + 8.0.100-preview.4.23172.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d27e2635a55c633ee799820e216698ac7774a807 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 02:35:12 +0000 Subject: [PATCH 651/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.1 -> To Version 7.0.300-preview.23172.26 --- 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 8fc949c06..7578b3c30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 - + https://github.com/dotnet/sdk - 5648fadae1f07a92ee738a307f835f6f5c1da086 + 2b629746dd86d27d6ab50b2c212fc8273b83f148 diff --git a/eng/Versions.props b/eng/Versions.props index 6eda8b859..402ff73a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.1 - 7.0.300-preview.23172.1 - 7.0.300-preview.23172.1 + 7.0.300-preview.23172.26 + 7.0.300-preview.23172.26 + 7.0.300-preview.23172.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ecdd4ad2af4e2e243e2d9b723beda81fb1c9f04a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 03:36:49 +0000 Subject: [PATCH 652/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.1 -> To Version 7.0.300-preview.23172.29 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23171.5 -> To Version 12.5.0-beta.23172.6 (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 7578b3c30..7ffab3b3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 - + https://github.com/dotnet/sdk - 2b629746dd86d27d6ab50b2c212fc8273b83f148 + 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - fa42aff3113ee163cde64511ee8d0128cf9ea3aa + 54773808aed924ea6ba071b1a0dd1db8da3007cc - + https://github.com/dotnet/fsharp - fa42aff3113ee163cde64511ee8d0128cf9ea3aa + 54773808aed924ea6ba071b1a0dd1db8da3007cc diff --git a/eng/Versions.props b/eng/Versions.props index 402ff73a9..0ff80698f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.26 - 7.0.300-preview.23172.26 - 7.0.300-preview.23172.26 + 7.0.300-preview.23172.29 + 7.0.300-preview.23172.29 + 7.0.300-preview.23172.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8953f007a52309ef3a22f655068be4f1574cecc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 03:51:31 +0000 Subject: [PATCH 653/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.20 -> To Version 8.0.100-preview.4.23172.28 --- 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 a80723111..313cddf92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 6f9dc3a890cf308dbb7f16a061dce8b66987b11a + 15100f990c82b753db693138abb9efdd9f589ef0 - + https://github.com/dotnet/sdk - 6f9dc3a890cf308dbb7f16a061dce8b66987b11a + 15100f990c82b753db693138abb9efdd9f589ef0 - + https://github.com/dotnet/sdk - 6f9dc3a890cf308dbb7f16a061dce8b66987b11a + 15100f990c82b753db693138abb9efdd9f589ef0 - + https://github.com/dotnet/sdk - 6f9dc3a890cf308dbb7f16a061dce8b66987b11a + 15100f990c82b753db693138abb9efdd9f589ef0 diff --git a/eng/Versions.props b/eng/Versions.props index 9f6035f4f..e33a9826d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.20 - 8.0.100-preview.4.23172.20 - 8.0.100-preview.4.23172.20 + 8.0.100-preview.4.23172.28 + 8.0.100-preview.4.23172.28 + 8.0.100-preview.4.23172.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c2d4c27baef7a3651973a1cd471f36b1de3780d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 04:49:11 +0000 Subject: [PATCH 654/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.20 -> To Version 8.0.100-preview.4.23172.31 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.4.23171.7 -> To Version 8.0.0-preview.4.23172.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 313cddf92..953297e51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 - + https://github.com/dotnet/aspnetcore - 16907a1efa1b53ea0c91984f90d8cef314fb4420 + 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 15100f990c82b753db693138abb9efdd9f589ef0 + ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b - + https://github.com/dotnet/sdk - 15100f990c82b753db693138abb9efdd9f589ef0 + ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b - + https://github.com/dotnet/sdk - 15100f990c82b753db693138abb9efdd9f589ef0 + ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b - + https://github.com/dotnet/sdk - 15100f990c82b753db693138abb9efdd9f589ef0 + ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b diff --git a/eng/Versions.props b/eng/Versions.props index e33a9826d..f5c7d40ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23171.7 - 8.0.0-preview.4.23171.7 - 8.0.0-preview.4.23171.7 - 8.0.0-preview.4.23171.7 - 8.0.0-preview.4.23171.7 - 8.0.0-preview.4.23171.7 - 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23172.5 0.2.0 - 8.0.100-preview.4.23172.28 - 8.0.100-preview.4.23172.28 - 8.0.100-preview.4.23172.28 + 8.0.100-preview.4.23172.31 + 8.0.100-preview.4.23172.31 + 8.0.100-preview.4.23172.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ebb651b9d4ed4177c1dec26b1add4071e7d48e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 04:53:49 +0000 Subject: [PATCH 655/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.1 -> To Version 7.0.300-preview.23172.30 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.23171.5 -> To Version 12.5.0-beta.23172.6 (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 7ffab3b3c..16bafdbb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b - + https://github.com/dotnet/sdk - 03f70fbc3a68911e02a2ec3bc11a0879308b71d6 + 68079cdee72cd5cce3928c26b5fd47616ed7338b @@ -154,9 +154,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b + f99e9b890eb66a8b4876aa6f93852717683e1fe4 diff --git a/eng/Versions.props b/eng/Versions.props index 0ff80698f..5c4c77322 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.29 - 7.0.300-preview.23172.29 - 7.0.300-preview.23172.29 + 7.0.300-preview.23172.30 + 7.0.300-preview.23172.30 + 7.0.300-preview.23172.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8297111f498659bc8be1c730b07521be6645a375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 05:48:33 +0000 Subject: [PATCH 656/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.20 -> To Version 8.0.100-preview.4.23172.32 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,NuGet.Build.Tasks From Version 8.0.0-preview.4.23171.7 -> To Version 8.0.0-preview.4.23172.5 (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 953297e51..b413a92f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b + aa7163317000aa67003080e3c8b1c2bc16a9841b - + https://github.com/dotnet/sdk - ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b + aa7163317000aa67003080e3c8b1c2bc16a9841b - + https://github.com/dotnet/sdk - ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b + aa7163317000aa67003080e3c8b1c2bc16a9841b - + https://github.com/dotnet/sdk - ed9037ce1d67bf7ace287351b3435eb1d4e7ed7b + aa7163317000aa67003080e3c8b1c2bc16a9841b @@ -156,9 +156,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b + f99e9b890eb66a8b4876aa6f93852717683e1fe4 diff --git a/eng/Versions.props b/eng/Versions.props index f5c7d40ce..424df4ae2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.31 - 8.0.100-preview.4.23172.31 - 8.0.100-preview.4.23172.31 + 8.0.100-preview.4.23172.32 + 8.0.100-preview.4.23172.32 + 8.0.100-preview.4.23172.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 305b48074a10482a9df0cd4403336e424618ce7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 06:50:52 +0000 Subject: [PATCH 657/864] Update dependencies from https://github.com/dotnet/sdk build 20230322.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.20 -> To Version 8.0.100-preview.4.23172.33 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.1 -> To Version 8.0.0-preview.4.23172.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b413a92f8..898ad0277 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - aa7163317000aa67003080e3c8b1c2bc16a9841b + d8b549b85299046654ba8e9bd0caff0eed507ae6 - + https://github.com/dotnet/sdk - aa7163317000aa67003080e3c8b1c2bc16a9841b + d8b549b85299046654ba8e9bd0caff0eed507ae6 - + https://github.com/dotnet/sdk - aa7163317000aa67003080e3c8b1c2bc16a9841b + d8b549b85299046654ba8e9bd0caff0eed507ae6 - + https://github.com/dotnet/sdk - aa7163317000aa67003080e3c8b1c2bc16a9841b + d8b549b85299046654ba8e9bd0caff0eed507ae6 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 7500625bd9303a48d0500b6123cec604e49039ae + 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 424df4ae2..5ea129440 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.32 - 8.0.100-preview.4.23172.32 - 8.0.100-preview.4.23172.32 + 8.0.100-preview.4.23172.33 + 8.0.100-preview.4.23172.33 + 8.0.100-preview.4.23172.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.9 - 8.0.0-preview.4.23172.1 - 8.0.0-preview.4.23172.1 - 8.0.0-preview.4.23172.1 - 8.0.0-preview.4.23172.1 - 8.0.0-preview.4.23172.1 - 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.9 2.1.0 From 834122e96a3d310a89ab81739dd8c6886a4f17aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 09:51:03 +0000 Subject: [PATCH 658/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23172.14 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 898ad0277..6b1000fbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - d8b549b85299046654ba8e9bd0caff0eed507ae6 + 391f3844cc41927b1329ac1db75505e5ba95a7c2 - + https://github.com/dotnet/sdk - d8b549b85299046654ba8e9bd0caff0eed507ae6 + 391f3844cc41927b1329ac1db75505e5ba95a7c2 - + https://github.com/dotnet/sdk - d8b549b85299046654ba8e9bd0caff0eed507ae6 + 391f3844cc41927b1329ac1db75505e5ba95a7c2 - + https://github.com/dotnet/sdk - d8b549b85299046654ba8e9bd0caff0eed507ae6 + 391f3844cc41927b1329ac1db75505e5ba95a7c2 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 6bcd4aa9cf626d6ee490a7bd35908cefd1603103 + 10abc299cc62376043cac6db7a962bb8991b4626 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 5ea129440..c0975b046 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23172.33 - 8.0.100-preview.4.23172.33 - 8.0.100-preview.4.23172.33 + 8.0.100-preview.4.23173.1 + 8.0.100-preview.4.23173.1 + 8.0.100-preview.4.23173.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.14 - 8.0.0-preview.4.23172.9 - 8.0.0-preview.4.23172.9 - 8.0.0-preview.4.23172.9 - 8.0.0-preview.4.23172.9 - 8.0.0-preview.4.23172.9 - 8.0.0-preview.4.23172.9 + 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23172.14 2.1.0 From 15ea822ce387730a784ce3f26bb2e83474df6b11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 10:55:37 +0000 Subject: [PATCH 659/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23172.14 (parent: Microsoft.NET.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 6b1000fbc..bbea83c9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 391f3844cc41927b1329ac1db75505e5ba95a7c2 + bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 - + https://github.com/dotnet/sdk - 391f3844cc41927b1329ac1db75505e5ba95a7c2 + bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 - + https://github.com/dotnet/sdk - 391f3844cc41927b1329ac1db75505e5ba95a7c2 + bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 - + https://github.com/dotnet/sdk - 391f3844cc41927b1329ac1db75505e5ba95a7c2 + bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 diff --git a/eng/Versions.props b/eng/Versions.props index c0975b046..ade87ac77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.1 - 8.0.100-preview.4.23173.1 - 8.0.100-preview.4.23173.1 + 8.0.100-preview.4.23173.2 + 8.0.100-preview.4.23173.2 + 8.0.100-preview.4.23173.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c73976aadcc5ef1629dc17664fa91f27ab651792 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 16:07:25 +0000 Subject: [PATCH 660/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.7 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23173.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbea83c9c..0851ecea3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 + d52bbbb0752867bd50cbadc166f7103824875309 - + https://github.com/dotnet/sdk - bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 + d52bbbb0752867bd50cbadc166f7103824875309 - + https://github.com/dotnet/sdk - bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 + d52bbbb0752867bd50cbadc166f7103824875309 - + https://github.com/dotnet/sdk - bdf7b7a56d17b8f4ce12262a4ef8ab9717961412 + d52bbbb0752867bd50cbadc166f7103824875309 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 10abc299cc62376043cac6db7a962bb8991b4626 + 830d3d009091a5f5a5260fafd6649f87892f8c4a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ade87ac77..32dbeaa29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.2 - 8.0.100-preview.4.23173.2 - 8.0.100-preview.4.23173.2 + 8.0.100-preview.4.23173.7 + 8.0.100-preview.4.23173.7 + 8.0.100-preview.4.23173.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23173.2 - 8.0.0-preview.4.23172.14 - 8.0.0-preview.4.23172.14 - 8.0.0-preview.4.23172.14 - 8.0.0-preview.4.23172.14 - 8.0.0-preview.4.23172.14 - 8.0.0-preview.4.23172.14 + 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.2 2.1.0 From b1b1ba1f9f62c03da71c057f4d07e29949ee7443 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 17:12:17 +0000 Subject: [PATCH 661/864] [main] Update dependencies from dotnet/arcade (#15911) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23170-01 to 1.2.0-beta-23171-02 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 898ad0277..3df8da679 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - b17c4b8af95a9652c3501df2702913ca94adb139 + e25f6609554cdfe545659c9035384e9cdff39529 - + https://github.com/dotnet/arcade - b17c4b8af95a9652c3501df2702913ca94adb139 + e25f6609554cdfe545659c9035384e9cdff39529 - + https://github.com/dotnet/arcade - b17c4b8af95a9652c3501df2702913ca94adb139 + e25f6609554cdfe545659c9035384e9cdff39529 https://github.com/dotnet/arcade-services @@ -217,9 +217,9 @@ c0406eca1fc7bac699242e1f4de0b54e382a7020 - + https://github.com/dotnet/sourcelink - 7c8e17b66d9d3741b3c6226757622fd729b13df2 + 26472dbb0185a75d7cde03a3e89abe7022974357 diff --git a/eng/Versions.props b/eng/Versions.props index 5ea129440..a225b4ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23171.2 + 8.0.0-beta.23172.2 diff --git a/global.json b/global.json index 2d860da02..c467759b2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23171.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23171.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23172.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23172.2" } } From 5f0f757aa1bcca4ae963002660505f47e23ab22e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 17:14:32 +0000 Subject: [PATCH 662/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23173.2 (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 0851ecea3..7a9efa3c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - d52bbbb0752867bd50cbadc166f7103824875309 + 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 - + https://github.com/dotnet/sdk - d52bbbb0752867bd50cbadc166f7103824875309 + 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 - + https://github.com/dotnet/sdk - d52bbbb0752867bd50cbadc166f7103824875309 + 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 - + https://github.com/dotnet/sdk - d52bbbb0752867bd50cbadc166f7103824875309 + 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 5d596bd99a06466c7b7aa67f7f66b108abad809a - + https://github.com/dotnet/fsharp - fa42aff3113ee163cde64511ee8d0128cf9ea3aa + 54773808aed924ea6ba071b1a0dd1db8da3007cc - + https://github.com/dotnet/fsharp - fa42aff3113ee163cde64511ee8d0128cf9ea3aa + 54773808aed924ea6ba071b1a0dd1db8da3007cc diff --git a/eng/Versions.props b/eng/Versions.props index 32dbeaa29..9e5c884d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.7 - 8.0.100-preview.4.23173.7 - 8.0.100-preview.4.23173.7 + 8.0.100-preview.4.23173.8 + 8.0.100-preview.4.23173.8 + 8.0.100-preview.4.23173.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b392f9871769123648b03492b6a9a7d70afaab8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 22:06:11 +0000 Subject: [PATCH 663/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.10 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23173.2 (parent: Microsoft.NET.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 7a9efa3c6..a6f32c399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 + 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d - + https://github.com/dotnet/sdk - 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 + 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d - + https://github.com/dotnet/sdk - 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 + 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d - + https://github.com/dotnet/sdk - 6629a7b8d99f0ee0e32206dc9d2c408b32bea705 + 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d diff --git a/eng/Versions.props b/eng/Versions.props index 9e5c884d3..988188920 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.8 - 8.0.100-preview.4.23173.8 - 8.0.100-preview.4.23173.8 + 8.0.100-preview.4.23173.10 + 8.0.100-preview.4.23173.10 + 8.0.100-preview.4.23173.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c7a0c1c864fb09add82172235c8afa7462c63c95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Mar 2023 23:14:03 +0000 Subject: [PATCH 664/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.11 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23173.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6f32c399..cfca46869 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d + 15c188cef03ed34bece707951f9e859c2a5784d9 - + https://github.com/dotnet/sdk - 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d + 15c188cef03ed34bece707951f9e859c2a5784d9 - + https://github.com/dotnet/sdk - 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d + 15c188cef03ed34bece707951f9e859c2a5784d9 - + https://github.com/dotnet/sdk - 2e3a93c9c591ddd8c368d7ca253cc9197d58fe6d + 15c188cef03ed34bece707951f9e859c2a5784d9 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 830d3d009091a5f5a5260fafd6649f87892f8c4a + f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 988188920..cea63f026 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.10 - 8.0.100-preview.4.23173.10 - 8.0.100-preview.4.23173.10 + 8.0.100-preview.4.23173.11 + 8.0.100-preview.4.23173.11 + 8.0.100-preview.4.23173.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.2 - 8.0.0-preview.4.23173.2 - 8.0.0-preview.4.23173.2 - 8.0.0-preview.4.23173.2 - 8.0.0-preview.4.23173.2 - 8.0.0-preview.4.23173.2 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 2.1.0 From 139d0c4ec8e9d0392187542d282ebb849c20ec22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 00:21:25 +0000 Subject: [PATCH 665/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23172.30 -> To Version 7.0.300-preview.23173.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks From Version 12.5.0-beta.23172.6 -> To Version 12.5.0-beta.23173.4 (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 16bafdbb9..213eb3756 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e - + https://github.com/dotnet/sdk - 68079cdee72cd5cce3928c26b5fd47616ed7338b + 0d2fd6e451b0f15da8a0fd1975799d441140ec8e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 54773808aed924ea6ba071b1a0dd1db8da3007cc + cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 - + https://github.com/dotnet/fsharp - 54773808aed924ea6ba071b1a0dd1db8da3007cc + cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 @@ -154,9 +154,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - f99e9b890eb66a8b4876aa6f93852717683e1fe4 + 80c3c74ca5c6d67912a19833e8cc2b10f875dc95 diff --git a/eng/Versions.props b/eng/Versions.props index 5c4c77322..5c5ce83e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23172.30 - 7.0.300-preview.23172.30 - 7.0.300-preview.23172.30 + 7.0.300-preview.23173.13 + 7.0.300-preview.23173.13 + 7.0.300-preview.23173.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6d38193835defc0bdaba2be1a78fccfd2bcf140 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 00:22:53 +0000 Subject: [PATCH 666/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23172.33 -> To Version 8.0.100-preview.4.23173.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23172.9 -> To Version 8.0.0-preview.4.23173.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfca46869..c8518aed6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a - + https://github.com/dotnet/aspnetcore - 1972d2772f36a1cfbe5d36fd7167ecf7e4e03e59 + 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 15c188cef03ed34bece707951f9e859c2a5784d9 + 055201f65a7ac425d688eefc9f05251ac1e19528 - + https://github.com/dotnet/sdk - 15c188cef03ed34bece707951f9e859c2a5784d9 + 055201f65a7ac425d688eefc9f05251ac1e19528 - + https://github.com/dotnet/sdk - 15c188cef03ed34bece707951f9e859c2a5784d9 + 055201f65a7ac425d688eefc9f05251ac1e19528 - + https://github.com/dotnet/sdk - 15c188cef03ed34bece707951f9e859c2a5784d9 + 055201f65a7ac425d688eefc9f05251ac1e19528 diff --git a/eng/Versions.props b/eng/Versions.props index cea63f026..6fbf273bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23172.5 - 8.0.0-preview.4.23172.5 - 8.0.0-preview.4.23172.5 - 8.0.0-preview.4.23172.5 - 8.0.0-preview.4.23172.5 - 8.0.0-preview.4.23172.5 - 8.0.0-preview.4.23172.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.5 0.2.0 - 8.0.100-preview.4.23173.11 - 8.0.100-preview.4.23173.11 - 8.0.100-preview.4.23173.11 + 8.0.100-preview.4.23173.12 + 8.0.100-preview.4.23173.12 + 8.0.100-preview.4.23173.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba5e7c064a0a0851a500f1efb9192fa056b1ccc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 02:43:04 +0000 Subject: [PATCH 667/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23173.12 -> To Version 8.0.100-preview.4.23173.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23173.5 -> To Version 8.0.0-preview.4.23173.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8afd2792d..d901d392b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 055201f65a7ac425d688eefc9f05251ac1e19528 + 9ce42a35c9683ce932c97b7c6542045c376a6f31 - + https://github.com/dotnet/sdk - 055201f65a7ac425d688eefc9f05251ac1e19528 + 9ce42a35c9683ce932c97b7c6542045c376a6f31 - + https://github.com/dotnet/sdk - 055201f65a7ac425d688eefc9f05251ac1e19528 + 9ce42a35c9683ce932c97b7c6542045c376a6f31 - + https://github.com/dotnet/sdk - 055201f65a7ac425d688eefc9f05251ac1e19528 + 9ce42a35c9683ce932c97b7c6542045c376a6f31 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - f52d11c9f6cbc6300301b9f07fe8e108b2a77bd4 + e88d8944bf235656577b900b488d05cbdf930419 https://github.com/dotnet/roslyn @@ -156,9 +156,9 @@ b84faa7d0dfb42daedca5c244f73f0b07e1135d7 - + https://github.com/nuget/nuget.client - f99e9b890eb66a8b4876aa6f93852717683e1fe4 + 80c3c74ca5c6d67912a19833e8cc2b10f875dc95 diff --git a/eng/Versions.props b/eng/Versions.props index dd8239a11..70bdfc70b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.12 - 8.0.100-preview.4.23173.12 - 8.0.100-preview.4.23173.12 + 8.0.100-preview.4.23173.14 + 8.0.100-preview.4.23173.14 + 8.0.100-preview.4.23173.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.7 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.7 2.1.0 From ebbd2f604a8dd06f8d2ce83c911c418776801c72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 06:21:05 +0000 Subject: [PATCH 668/864] Update dependencies from https://github.com/dotnet/sdk build 20230323.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23173.12 -> To Version 8.0.100-preview.4.23173.15 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23173.5 -> To Version 8.0.0-preview.4.23173.13 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d901d392b..47b92843b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 9ce42a35c9683ce932c97b7c6542045c376a6f31 + e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b - + https://github.com/dotnet/sdk - 9ce42a35c9683ce932c97b7c6542045c376a6f31 + e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b - + https://github.com/dotnet/sdk - 9ce42a35c9683ce932c97b7c6542045c376a6f31 + e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b - + https://github.com/dotnet/sdk - 9ce42a35c9683ce932c97b7c6542045c376a6f31 + e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - e88d8944bf235656577b900b488d05cbdf930419 + 0cf4023a475974052c2046e110199ad8fa55a884 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 70bdfc70b..5a3b8ff0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.14 - 8.0.100-preview.4.23173.14 - 8.0.100-preview.4.23173.14 + 8.0.100-preview.4.23173.15 + 8.0.100-preview.4.23173.15 + 8.0.100-preview.4.23173.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.13 - 8.0.0-preview.4.23173.7 - 8.0.0-preview.4.23173.7 - 8.0.0-preview.4.23173.7 - 8.0.0-preview.4.23173.7 - 8.0.0-preview.4.23173.7 - 8.0.0-preview.4.23173.7 + 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23173.13 2.1.0 From ac018da533a09635c21677655caa2b76d1b53eca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 09:14:23 +0000 Subject: [PATCH 669/864] Update dependencies from https://github.com/dotnet/sdk build 20230324.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23173.13 -> To Version 7.0.300-preview.23174.1 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23171-02 -> To Version 17.6.0-preview-23174-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 213eb3756..d9058943c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f - + https://github.com/dotnet/sdk - 0d2fd6e451b0f15da8a0fd1975799d441140ec8e + a21e9c821c4d4dcb2edd190560ac355fe0041c0f @@ -149,9 +149,9 @@ 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - b84faa7d0dfb42daedca5c244f73f0b07e1135d7 + e7de1330724224a542668e1ef82c997613c7080c diff --git a/eng/Versions.props b/eng/Versions.props index 5c5ce83e1..c9d8b4d3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23173.13 - 7.0.300-preview.23173.13 - 7.0.300-preview.23173.13 + 7.0.300-preview.23174.1 + 7.0.300-preview.23174.1 + 7.0.300-preview.23174.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ad5a6f3a353ec4fd29cb386b61f3008308dc197 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 16:06:16 +0000 Subject: [PATCH 670/864] Update dependencies from https://github.com/dotnet/sdk build 20230324.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.1 -> To Version 7.0.300-preview.23174.3 --- 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 d9058943c..f972cd71b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 - + https://github.com/dotnet/sdk - a21e9c821c4d4dcb2edd190560ac355fe0041c0f + eabf9d4edeb9f6faac2478dd02759629e3f8fa16 diff --git a/eng/Versions.props b/eng/Versions.props index c9d8b4d3d..14b5a798c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.1 - 7.0.300-preview.23174.1 - 7.0.300-preview.23174.1 + 7.0.300-preview.23174.3 + 7.0.300-preview.23174.3 + 7.0.300-preview.23174.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c07c5626d21a665fa3151f0194742ad97115f555 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:11:50 +0000 Subject: [PATCH 671/864] [main] Update dependencies from dotnet/sdk (#15917) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.4.23173.13 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47b92843b..0fc90a20e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b + 2542c404515c9ac4d2520ec2d3fa40d1d5817299 - + https://github.com/dotnet/sdk - e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b + 2542c404515c9ac4d2520ec2d3fa40d1d5817299 - + https://github.com/dotnet/sdk - e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b + 2542c404515c9ac4d2520ec2d3fa40d1d5817299 - + https://github.com/dotnet/sdk - e0406984f70b53f6afa5eb0c56c00e2d4c63ea5b + 2542c404515c9ac4d2520ec2d3fa40d1d5817299 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 0cf4023a475974052c2046e110199ad8fa55a884 + 915ad08db2bbbc6b63757db0f6da8446ab8426d6 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 5a3b8ff0d..a31321318 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23173.15 - 8.0.100-preview.4.23173.15 - 8.0.100-preview.4.23173.15 + 8.0.100-preview.4.23174.4 + 8.0.100-preview.4.23174.4 + 8.0.100-preview.4.23174.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23173.13 - 8.0.0-preview.4.23173.13 - 8.0.0-preview.4.23173.13 - 8.0.0-preview.4.23173.13 - 8.0.0-preview.4.23173.13 - 8.0.0-preview.4.23173.13 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 2.1.0 From 7f96ea49e01407e81f23dfa2b6cf7fe8dc986827 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:13:12 +0000 Subject: [PATCH 672/864] [main] Update dependencies from dotnet/arcade (#15918) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23171-02 to 1.2.0-beta-23172-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23169.1 to 1.0.0-beta.23172.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 20 +++++----- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 68 ++++++++++++++++++++++++++++---- eng/common/cross/toolchain.cmake | 3 ++ global.json | 4 +- 5 files changed, 76 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fc90a20e..00e28fed6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - e25f6609554cdfe545659c9035384e9cdff39529 + e3d501e3e78ab724254e6797473e34f787674857 - + https://github.com/dotnet/arcade - e25f6609554cdfe545659c9035384e9cdff39529 + e3d501e3e78ab724254e6797473e34f787674857 - + https://github.com/dotnet/arcade - e25f6609554cdfe545659c9035384e9cdff39529 + e3d501e3e78ab724254e6797473e34f787674857 https://github.com/dotnet/arcade-services @@ -217,14 +217,14 @@ c0406eca1fc7bac699242e1f4de0b54e382a7020 - + https://github.com/dotnet/sourcelink - 26472dbb0185a75d7cde03a3e89abe7022974357 + a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3 - + https://github.com/dotnet/xliff-tasks - 599baeb23fc6d6ca5e693822c422cabd6daa2c4c + f2ad3b152aac2a3f1c620178e9004b1f84ccfd1d diff --git a/eng/Versions.props b/eng/Versions.props index a31321318..da4c6bf76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23172.2 + 8.0.0-beta.23173.3 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ff113f733..1deadcc67 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -14,6 +14,7 @@ usage() echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." + echo "--skipsigcheck - optional, will skip package signature checks (allowing untrusted packages)." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." echo "--jobs N - optional, restrict to N jobs." exit 1 @@ -99,7 +100,27 @@ __HaikuPackages+=" mpfr_devel" __UbuntuPackages+=" libomp5" __UbuntuPackages+=" libomp-dev" +# Taken from https://github.com/alpinelinux/alpine-chroot-install/blob/6d08f12a8a70dd9b9dc7d997c88aa7789cc03c42/alpine-chroot-install#L85-L133 +__AlpineKeys=' +4a6a0840:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe\nqxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O\nQ0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA\njixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R\nL5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo\nGuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B\nywIDAQAB +5243ef4b:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+\nmTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy\nDO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K\naA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G\nmnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0\nsS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg\ncQIDAQAB +524d27bb:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr8s1q88XpuJWLCZALdKj\nlN8wg2ePB2T9aIcaxryYE/Jkmtu+ZQ5zKq6BT3y/udt5jAsMrhHTwroOjIsF9DeG\ne8Y3vjz+Hh4L8a7hZDaw8jy3CPag47L7nsZFwQOIo2Cl1SnzUc6/owoyjRU7ab0p\niWG5HK8IfiybRbZxnEbNAfT4R53hyI6z5FhyXGS2Ld8zCoU/R4E1P0CUuXKEN4p0\n64dyeUoOLXEWHjgKiU1mElIQj3k/IF02W89gDj285YgwqA49deLUM7QOd53QLnx+\nxrIrPv3A+eyXMFgexNwCKQU9ZdmWa00MjjHlegSGK8Y2NPnRoXhzqSP9T9i2HiXL\nVQIDAQAB +5261cecb:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0\ncGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX\nyHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j\ng01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB\nCa1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY\nsWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw\nwwIDAQAB +58199dcc:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3v8/ye/V/t5xf4JiXLXa\nhWFRozsnmn3hobON20GdmkrzKzO/eUqPOKTpg2GtvBhK30fu5oY5uN2ORiv2Y2ht\neLiZ9HVz3XP8Fm9frha60B7KNu66FO5P2o3i+E+DWTPqqPcCG6t4Znk2BypILcit\nwiPKTsgbBQR2qo/cO01eLLdt6oOzAaF94NH0656kvRewdo6HG4urbO46tCAizvCR\nCA7KGFMyad8WdKkTjxh8YLDLoOCtoZmXmQAiwfRe9pKXRH/XXGop8SYptLqyVVQ+\ntegOD9wRs2tOlgcLx4F/uMzHN7uoho6okBPiifRX+Pf38Vx+ozXh056tjmdZkCaV\naQIDAQAB +58cbb476:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoSPnuAGKtRIS5fEgYPXD\n8pSGvKAmIv3A08LBViDUe+YwhilSHbYXUEAcSH1KZvOo1WT1x2FNEPBEFEFU1Eyc\n+qGzbA03UFgBNvArurHQ5Z/GngGqE7IarSQFSoqewYRtFSfp+TL9CUNBvM0rT7vz\n2eMu3/wWG+CBmb92lkmyWwC1WSWFKO3x8w+Br2IFWvAZqHRt8oiG5QtYvcZL6jym\nY8T6sgdDlj+Y+wWaLHs9Fc+7vBuyK9C4O1ORdMPW15qVSl4Lc2Wu1QVwRiKnmA+c\nDsH/m7kDNRHM7TjWnuj+nrBOKAHzYquiu5iB3Qmx+0gwnrSVf27Arc3ozUmmJbLj\nzQIDAQAB +58e4f17d:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBxJN9ErBgdRcPr5g4hV\nqyUSGZEKuvQliq2Z9SRHLh2J43+EdB6A+yzVvLnzcHVpBJ+BZ9RV30EM9guck9sh\nr+bryZcRHyjG2wiIEoduxF2a8KeWeQH7QlpwGhuobo1+gA8L0AGImiA6UP3LOirl\nI0G2+iaKZowME8/tydww4jx5vG132JCOScMjTalRsYZYJcjFbebQQolpqRaGB4iG\nWqhytWQGWuKiB1A22wjmIYf3t96l1Mp+FmM2URPxD1gk/BIBnX7ew+2gWppXOK9j\n1BJpo0/HaX5XoZ/uMqISAAtgHZAqq+g3IUPouxTphgYQRTRYpz2COw3NF43VYQrR\nbQIDAQAB +60ac2099:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR4uJVtJOnOFGchnMW5Y\nj5/waBdG1u5BTMlH+iQMcV5+VgWhmpZHJCBz3ocD+0IGk2I68S5TDOHec/GSC0lv\n6R9o6F7h429GmgPgVKQsc8mPTPtbjJMuLLs4xKc+viCplXc0Nc0ZoHmCH4da6fCV\ntdpHQjVe6F9zjdquZ4RjV6R6JTiN9v924dGMAkbW/xXmamtz51FzondKC52Gh8Mo\n/oA0/T0KsCMCi7tb4QNQUYrf+Xcha9uus4ww1kWNZyfXJB87a2kORLiWMfs2IBBJ\nTmZ2Fnk0JnHDb8Oknxd9PvJPT0mvyT8DA+KIAPqNvOjUXP4bnjEHJcoCP9S5HkGC\nIQIDAQAB +6165ee59:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAutQkua2CAig4VFSJ7v54\nALyu/J1WB3oni7qwCZD3veURw7HxpNAj9hR+S5N/pNeZgubQvJWyaPuQDm7PTs1+\ntFGiYNfAsiibX6Rv0wci3M+z2XEVAeR9Vzg6v4qoofDyoTbovn2LztaNEjTkB+oK\ntlvpNhg1zhou0jDVYFniEXvzjckxswHVb8cT0OMTKHALyLPrPOJzVtM9C1ew2Nnc\n3848xLiApMu3NBk0JqfcS3Bo5Y2b1FRVBvdt+2gFoKZix1MnZdAEZ8xQzL/a0YS5\nHd0wj5+EEKHfOd3A75uPa/WQmA+o0cBFfrzm69QDcSJSwGpzWrD1ScH3AK8nWvoj\nv7e9gukK/9yl1b4fQQ00vttwJPSgm9EnfPHLAtgXkRloI27H6/PuLoNvSAMQwuCD\nhQRlyGLPBETKkHeodfLoULjhDi1K2gKJTMhtbnUcAA7nEphkMhPWkBpgFdrH+5z4\nLxy+3ek0cqcI7K68EtrffU8jtUj9LFTUC8dERaIBs7NgQ/LfDbDfGh9g6qVj1hZl\nk9aaIPTm/xsi8v3u+0qaq7KzIBc9s59JOoA8TlpOaYdVgSQhHHLBaahOuAigH+VI\nisbC9vmqsThF2QdDtQt37keuqoda2E6sL7PUvIyVXDRfwX7uMDjlzTxHTymvq2Ck\nhtBqojBnThmjJQFgZXocHG8CAwEAAQ== +61666e3f:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlEyxkHggKCXC2Wf5Mzx4\nnZLFZvU2bgcA3exfNPO/g1YunKfQY+Jg4fr6tJUUTZ3XZUrhmLNWvpvSwDS19ZmC\nIXOu0+V94aNgnhMsk9rr59I8qcbsQGIBoHzuAl8NzZCgdbEXkiY90w1skUw8J57z\nqCsMBydAueMXuWqF5nGtYbi5vHwK42PffpiZ7G5Kjwn8nYMW5IZdL6ZnMEVJUWC9\nI4waeKg0yskczYDmZUEAtrn3laX9677ToCpiKrvmZYjlGl0BaGp3cxggP2xaDbUq\nqfFxWNgvUAb3pXD09JM6Mt6HSIJaFc9vQbrKB9KT515y763j5CC2KUsilszKi3mB\nHYe5PoebdjS7D1Oh+tRqfegU2IImzSwW3iwA7PJvefFuc/kNIijfS/gH/cAqAK6z\nbhdOtE/zc7TtqW2Wn5Y03jIZdtm12CxSxwgtCF1NPyEWyIxAQUX9ACb3M0FAZ61n\nfpPrvwTaIIxxZ01L3IzPLpbc44x/DhJIEU+iDt6IMTrHOphD9MCG4631eIdB0H1b\n6zbNX1CXTsafqHRFV9XmYYIeOMggmd90s3xIbEujA6HKNP/gwzO6CDJ+nHFDEqoF\nSkxRdTkEqjTjVKieURW7Swv7zpfu5PrsrrkyGnsRrBJJzXlm2FOOxnbI2iSL1B5F\nrO5kbUxFeZUIDq+7Yv4kLWcCAwEAAQ== +616a9724:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnC+bR4bHf/L6QdU4puhQ\ngl1MHePszRC38bzvVFDUJsmCaMCL2suCs2A2yxAgGb9pu9AJYLAmxQC4mM3jNqhg\n/E7yuaBbek3O02zN/ctvflJ250wZCy+z0ZGIp1ak6pu1j14IwHokl9j36zNfGtfv\nADVOcdpWITFFlPqwq1qt/H3UsKVmtiF3BNWWTeUEQwKvlU8ymxgS99yn0+4OPyNT\nL3EUeS+NQJtDS01unau0t7LnjUXn+XIneWny8bIYOQCuVR6s/gpIGuhBaUqwaJOw\n7jkJZYF2Ij7uPb4b5/R3vX2FfxxqEHqssFSg8FFUNTZz3qNZs0CRVyfA972g9WkJ\nhPfn31pQYil4QGRibCMIeU27YAEjXoqfJKEPh4UWMQsQLrEfdGfb8VgwrPbniGfU\nL3jKJR3VAafL9330iawzVQDlIlwGl6u77gEXMl9K0pfazunYhAp+BMP+9ot5ckK+\nosmrqj11qMESsAj083GeFdfV3pXEIwUytaB0AKEht9DbqUfiE/oeZ/LAXgySMtVC\nsbC4ESmgVeY2xSBIJdDyUap7FR49GGrw0W49NUv9gRgQtGGaNVQQO9oGL2PBC41P\niWF9GLoX30HIz1P8PF/cZvicSSPkQf2Z6TV+t0ebdGNS5DjapdnCrq8m9Z0pyKsQ\nuxAL2a7zX8l5i1CZh1ycUGsCAwEAAQ== +616abc23:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0MfCDrhODRCIxR9Dep1s\neXafh5CE5BrF4WbCgCsevyPIdvTeyIaW4vmO3bbG4VzhogDZju+R3IQYFuhoXP5v\nY+zYJGnwrgz3r5wYAvPnLEs1+dtDKYOgJXQj+wLJBW1mzRDL8FoRXOe5iRmn1EFS\nwZ1DoUvyu7/J5r0itKicZp3QKED6YoilXed+1vnS4Sk0mzN4smuMR9eO1mMCqNp9\n9KTfRDHTbakIHwasECCXCp50uXdoW6ig/xUAFanpm9LtK6jctNDbXDhQmgvAaLXZ\nLvFqoaYJ/CvWkyYCgL6qxvMvVmPoRv7OPcyni4xR/WgWa0MSaEWjgPx3+yj9fiMA\n1S02pFWFDOr5OUF/O4YhFJvUCOtVsUPPfA/Lj6faL0h5QI9mQhy5Zb9TTaS9jB6p\nLw7u0dJlrjFedk8KTJdFCcaGYHP6kNPnOxMylcB/5WcztXZVQD5WpCicGNBxCGMm\nW64SgrV7M07gQfL/32QLsdqPUf0i8hoVD8wfQ3EpbQzv6Fk1Cn90bZqZafg8XWGY\nwddhkXk7egrr23Djv37V2okjzdqoyLBYBxMz63qQzFoAVv5VoY2NDTbXYUYytOvG\nGJ1afYDRVWrExCech1mX5ZVUB1br6WM+psFLJFoBFl6mDmiYt0vMYBddKISsvwLl\nIJQkzDwtXzT2cSjoj3T5QekCAwEAAQ== +616ac3bc:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvaaoSLab+IluixwKV5Od\n0gib2YurjPatGIbn5Ov2DLUFYiebj2oJINXJSwUOO+4WcuHFEqiL/1rya+k5hLZt\nhnPL1tn6QD4rESznvGSasRCQNT2vS/oyZbTYJRyAtFkEYLlq0t3S3xBxxHWuvIf0\nqVxVNYpQWyM3N9RIeYBR/euXKJXileSHk/uq1I5wTC0XBIHWcthczGN0m9wBEiWS\n0m3cnPk4q0Ea8mUJ91Rqob19qETz6VbSPYYpZk3qOycjKosuwcuzoMpwU8KRiMFd\n5LHtX0Hx85ghGsWDVtS0c0+aJa4lOMGvJCAOvDfqvODv7gKlCXUpgumGpLdTmaZ8\n1RwqspAe3IqBcdKTqRD4m2mSg23nVx2FAY3cjFvZQtfooT7q1ItRV5RgH6FhQSl7\n+6YIMJ1Bf8AAlLdRLpg+doOUGcEn+pkDiHFgI8ylH1LKyFKw+eXaAml/7DaWZk1d\ndqggwhXOhc/UUZFQuQQ8A8zpA13PcbC05XxN2hyP93tCEtyynMLVPtrRwDnHxFKa\nqKzs3rMDXPSXRn3ZZTdKH3069ApkEjQdpcwUh+EmJ1Ve/5cdtzT6kKWCjKBFZP/s\n91MlRrX2BTRdHaU5QJkUheUtakwxuHrdah2F94lRmsnQlpPr2YseJu6sIE+Dnx4M\nCfhdVbQL2w54R645nlnohu8CAwEAAQ== +616adfeb:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU\npNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X\n0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6\nADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ\nraQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy\nKLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj\n/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H\nKuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs\nmFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1\n/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq\nXIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4\nVORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ== +616ae350:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0\nXkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ\npiM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46\nxLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP\nODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM\nEyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr\nDzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+\nf53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF\nHwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk\nOk9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6\n9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT\nJZDr++FjKrnnijbyNF8b98UCAwEAAQ== +616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ== +' __Keyring= +__SkipSigCheck=0 __UseMirror=0 __UnprocessedBuildArgs= @@ -184,11 +205,12 @@ while :; do ;; x64) __BuildArch=x64 + __AlpineArch=x86_64 __UbuntuArch=amd64 __FreeBSDArch=amd64 __FreeBSDMachineArch=amd64 __illumosArch=x86_64 - __UbuntuRepo= + __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; x86) __BuildArch=x86 @@ -324,6 +346,9 @@ while :; do --skipunmount) __SkipUnmount=1 ;; + --skipsigcheck) + __SkipSigCheck=1 + ;; --rootfsdir|-rootfsdir) shift __RootfsDir="$1" @@ -351,7 +376,6 @@ case "$__AlpineVersion" in edge) __AlpineLlvmLibsLookup=1 ;; *) if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then - echo boo __AlpineVersion=3.15 # minimum version that supports lldb-dev __AlpinePackages+=" llvm12-libs" elif [[ "$__AlpineArch" == "x86" ]]; then @@ -380,6 +404,11 @@ if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" fi +if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then + # libnuma-dev is not available on armhf for xenial + __UbuntuPackages="${__UbuntuPackages//libnuma-dev/}" +fi + __UbuntuPackages+=" ${__LLDB_Package:-}" if [[ -n "$__LLVM_MajorVersion" ]]; then @@ -406,13 +435,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 + __ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33 __ApkToolsDir="$(mktemp -d)" + __ApkKeysDir="$(mktemp -d)" wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" - mkdir -p "$__RootfsDir"/usr/bin - cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin" + if [[ -f "/usr/bin/qemu-$__QEMUArch-static" ]]; then + mkdir -p "$__RootfsDir"/usr/bin + cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin" + fi if [[ "$__AlpineVersion" == "edge" ]]; then version=edge @@ -420,17 +454,30 @@ if [[ "$__CodeName" == "alpine" ]]; then version="v$__AlpineVersion" fi + for line in $__AlpineKeys; do + id="${line%%:*}" + content="${line#*:}" + + echo -e "-----BEGIN PUBLIC KEY-----\n$content\n-----END PUBLIC KEY-----" > "$__ApkKeysDir/alpine-devel@lists.alpinelinux.org-$id.rsa.pub" + done + + if [[ "$__SkipSigCheck" == "1" ]]; then + __ApkSignatureArg="--allow-untrusted" + else + __ApkSignatureArg="--keys-dir $__ApkKeysDir" + fi + # initialize DB "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add + -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" fi @@ -438,7 +485,7 @@ if [[ "$__CodeName" == "alpine" ]]; then "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ add $__AlpinePackages rm -r "$__ApkToolsDir" @@ -574,7 +621,12 @@ elif [[ "$__CodeName" == "haiku" ]]; then fi done elif [[ -n "$__CodeName" ]]; then - qemu-debootstrap $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" + + if [[ "$__SkipSigCheck" == "0" ]]; then + __Keyring="$__Keyring --force-check-gpg" + fi + + debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" chroot "$__RootfsDir" apt-get update chroot "$__RootfsDir" apt-get -f -y install diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ccfb9951a..d813dde6d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -298,6 +298,9 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY}) + # persist variables across multiple try_compile passes + list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CLR_ARM_FPU_TYPE CLR_ARM_FPU_CAPABILITY) + if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) endif() diff --git a/global.json b/global.json index c467759b2..14df7aeec 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23172.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23172.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23173.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23173.3" } } From 920442247fb66b58a6252124bee7d0d5d0bc7dbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 18:04:40 +0000 Subject: [PATCH 673/864] Update dependencies from https://github.com/dotnet/test-templates build 20230324.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23174.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e28fed6..bce98d7aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index da4c6bf76..d8718d8cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 From 606f8a8f51d554c06bf58b9cd8a5adcad94afa31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 18:04:42 +0000 Subject: [PATCH 674/864] Update dependencies from https://github.com/dotnet/test-templates build 20230324.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23174.1 --- NuGet.config | 5 ----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3038e77bd..770df6dcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bd34ec5..3f19cb1f8 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 - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada diff --git a/eng/Versions.props b/eng/Versions.props index 355237ca9..14686b8c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 From c7422ccf5b0031d817aa62e2230395589add8609 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 18:04:43 +0000 Subject: [PATCH 675/864] Update dependencies from https://github.com/dotnet/test-templates build 20230324.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23174.1 --- 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 d9058943c..9f88925d3 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 - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/test-templates - 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 + eb937b61acd09d5698e9c16d80e2ad49f4eeaada diff --git a/eng/Versions.props b/eng/Versions.props index c9d8b4d3d..f89b98753 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 - 1.1.0-rc.23166.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 + 1.1.0-rc.23174.1 From 416edaf1c2f8884224ccd1cf4d7d434159bb025e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 21:37:33 +0000 Subject: [PATCH 676/864] Update dependencies from https://github.com/dotnet/sdk build 20230324.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.1 -> To Version 7.0.300-preview.23174.14 --- 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 f972cd71b..0c6b6e0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b - + https://github.com/dotnet/sdk - eabf9d4edeb9f6faac2478dd02759629e3f8fa16 + 5d56cadbae6defb597362134e3a7af212b518a2b diff --git a/eng/Versions.props b/eng/Versions.props index 14b5a798c..56cbf8053 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.3 - 7.0.300-preview.23174.3 - 7.0.300-preview.23174.3 + 7.0.300-preview.23174.14 + 7.0.300-preview.23174.14 + 7.0.300-preview.23174.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6ca727c8d0c04f08c44a2619e075ab6809fb7087 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 21:37:47 +0000 Subject: [PATCH 677/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230324.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23171.1 -> To Version 8.0.0-alpha.1.23174.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e28fed6..52b60f1e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c0406eca1fc7bac699242e1f4de0b54e382a7020 + f560ccccbe4c4d9e181447814fa9000f025328cc From eb3a815a3b7511f44143f30bfb7ac7fe7993cd43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:55:55 +0000 Subject: [PATCH 678/864] [main] Update dependencies from dotnet/sdk (#15924) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.4.23173.5 to 8.0.0-preview.4.23174.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230320-03 to 17.6.0-preview-20230323-05 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e28fed6..5ecba502c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 915ad08db2bbbc6b63757db0f6da8446ab8426d6 - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf - + https://github.com/dotnet/aspnetcore - 94e664ee9a7e4f12930ca5ef8f26e59fe168b44a + 520c18777aa51e4a56ca30554daf58ae492a03bf https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 2542c404515c9ac4d2520ec2d3fa40d1d5817299 + f0f833406ce28e502da0da1f6054db96adecf96e - + https://github.com/dotnet/sdk - 2542c404515c9ac4d2520ec2d3fa40d1d5817299 + f0f833406ce28e502da0da1f6054db96adecf96e - + https://github.com/dotnet/sdk - 2542c404515c9ac4d2520ec2d3fa40d1d5817299 + f0f833406ce28e502da0da1f6054db96adecf96e - + https://github.com/dotnet/sdk - 2542c404515c9ac4d2520ec2d3fa40d1d5817299 + f0f833406ce28e502da0da1f6054db96adecf96e @@ -137,7 +137,7 @@ 54773808aed924ea6ba071b1a0dd1db8da3007cc - + https://github.com/microsoft/vstest 2d656fe2133f89248825419fb8ffac5505486906 diff --git a/eng/Versions.props b/eng/Versions.props index da4c6bf76..a0a9e306a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 - 8.0.0-preview.4.23173.5 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.2 0.2.0 - 8.0.100-preview.4.23174.4 - 8.0.100-preview.4.23174.4 - 8.0.100-preview.4.23174.4 + 8.0.100-preview.4.23174.10 + 8.0.100-preview.4.23174.10 + 8.0.100-preview.4.23174.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -218,7 +218,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230320-03 + 17.6.0-preview-20230323-05 8.0.0-alpha.1.22557.12 From 7f2e384c2b5db41e5c087fd687fdffc6270a57b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 22:31:02 +0000 Subject: [PATCH 679/864] Update dependencies from https://github.com/dotnet/sdk build 20230324.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23174.10 -> To Version 8.0.100-preview.4.23174.20 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23174.2 -> To Version 8.0.0-preview.4.23174.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ecba502c..daf110f6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - f0f833406ce28e502da0da1f6054db96adecf96e + 5dcdf394dc01c681079fb777ae984f9149b056ef - + https://github.com/dotnet/sdk - f0f833406ce28e502da0da1f6054db96adecf96e + 5dcdf394dc01c681079fb777ae984f9149b056ef - + https://github.com/dotnet/sdk - f0f833406ce28e502da0da1f6054db96adecf96e + 5dcdf394dc01c681079fb777ae984f9149b056ef - + https://github.com/dotnet/sdk - f0f833406ce28e502da0da1f6054db96adecf96e + 5dcdf394dc01c681079fb777ae984f9149b056ef @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 915ad08db2bbbc6b63757db0f6da8446ab8426d6 + 96a003edd9e25a7b4b693b6a7717ad4d46937a8b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a0a9e306a..5fd1064f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23174.10 - 8.0.100-preview.4.23174.10 - 8.0.100-preview.4.23174.10 + 8.0.100-preview.4.23174.20 + 8.0.100-preview.4.23174.20 + 8.0.100-preview.4.23174.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23174.4 2.1.0 From b7761933be784e341415166e8868cab91c5a9706 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Mar 2023 23:32:19 +0000 Subject: [PATCH 680/864] Update dependencies from https://github.com/dotnet/sdk build 20230324.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.1 -> To Version 7.0.300-preview.23174.22 --- 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 0c6b6e0bd..37e7a0ff7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 - + https://github.com/dotnet/sdk - 5d56cadbae6defb597362134e3a7af212b518a2b + c73800a06184e993e8194be83e227439f9094214 diff --git a/eng/Versions.props b/eng/Versions.props index 56cbf8053..10dfcc1ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.14 - 7.0.300-preview.23174.14 - 7.0.300-preview.23174.14 + 7.0.300-preview.23174.22 + 7.0.300-preview.23174.22 + 7.0.300-preview.23174.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 38be1b1ed87352079d0422fdf5c3d3a19286471c Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:42:13 -0700 Subject: [PATCH 681/864] Change property name (#15907) This means the package version property won't collide with MicrosoftNetCompilersToolsetPackageVersion, which is already in use for another package, albeit the core version of the same package. --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index c26ce129b..4255356ef 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -351,7 +351,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\')) %24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs - $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) From 47b3f27a5951e7afcc99fbc19fa152addf1945b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Mar 2023 12:21:57 +0000 Subject: [PATCH 682/864] Update dependencies from https://github.com/dotnet/arcade build 20230324.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23173.3 -> To Version 8.0.0-beta.23174.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ecba502c..e5ea0fa9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ - + https://github.com/dotnet/arcade - e3d501e3e78ab724254e6797473e34f787674857 + 1177b37e60c7271ab461098aefbdd03edc15b90d - + https://github.com/dotnet/arcade - e3d501e3e78ab724254e6797473e34f787674857 + 1177b37e60c7271ab461098aefbdd03edc15b90d - + https://github.com/dotnet/arcade - e3d501e3e78ab724254e6797473e34f787674857 + 1177b37e60c7271ab461098aefbdd03edc15b90d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index a0a9e306a..5b2835387 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23173.3 + 8.0.0-beta.23174.1 diff --git a/global.json b/global.json index 14df7aeec..df9ab0d5a 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23173.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23173.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23174.1" } } From 4b3902d23bfbee42af83ed23d46871d847f65546 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Mar 2023 06:43:54 +0000 Subject: [PATCH 683/864] Update dependencies from https://github.com/dotnet/sdk build 20230326.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23174.22 -> To Version 7.0.300-preview.23176.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23173.4 -> To Version 12.5.0-beta.23176.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 ed0dab1a1..7de42121f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 - + https://github.com/dotnet/sdk - c73800a06184e993e8194be83e227439f9094214 + 1bddf64d4d41da91ee011becd0574801a5b4c487 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 + 93562c0c97dda1fb131e8eaf73e35487a6998ee5 - + https://github.com/dotnet/fsharp - cd43c1e8cf0a8e1fe7cf16dc405361de699f3833 + 93562c0c97dda1fb131e8eaf73e35487a6998ee5 diff --git a/eng/Versions.props b/eng/Versions.props index 86e19930b..dce9a4f7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23174.22 - 7.0.300-preview.23174.22 - 7.0.300-preview.23174.22 + 7.0.300-preview.23176.6 + 7.0.300-preview.23176.6 + 7.0.300-preview.23176.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a79315109c88cb264197d1c9f5d2d8127fa6ab75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Mar 2023 10:30:33 +0000 Subject: [PATCH 684/864] Update dependencies from https://github.com/dotnet/sdk build 20230327.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23176.6 -> To Version 7.0.300-preview.23177.3 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230223-05 -> To Version 17.6.0-release-20230324-04 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7de42121f..972fe0888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c - + https://github.com/dotnet/sdk - 1bddf64d4d41da91ee011becd0574801a5b4c487 + bf00d9be88196ce70e2a863559c41f414406702c @@ -133,9 +133,9 @@ 93562c0c97dda1fb131e8eaf73e35487a6998ee5 - + https://github.com/microsoft/vstest - 05c0c4c4f084782533443dfeae0f6627018c5b6a + 5bef4cdc79ad79f5627c028b6cf06a4197aa9c54 diff --git a/eng/Versions.props b/eng/Versions.props index dce9a4f7e..eddee8a51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23176.6 - 7.0.300-preview.23176.6 - 7.0.300-preview.23176.6 + 7.0.300-preview.23177.3 + 7.0.300-preview.23177.3 + 7.0.300-preview.23177.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230223-05 + 17.6.0-release-20230324-04 From fe171f9b19975e891cbaa809a31764d5a2ad7576 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Mar 2023 10:45:48 +0000 Subject: [PATCH 685/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230327.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23174.1 -> To Version 8.0.0-alpha.1.23177.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8c1adab8..5e2c2f6f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - f560ccccbe4c4d9e181447814fa9000f025328cc + 0d434a1f8c5d112adf6cfbaee93fea24b63a328a From 7a0e084715e88a009bd2598531cd9ed239cf76b2 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 27 Mar 2023 14:42:15 -0500 Subject: [PATCH 686/864] Shutdown the build server before each build. (#15894) Co-authored-by: Michael Simons --- src/SourceBuild/tarball/content/repos/Directory.Build.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 7bf88fdd6..ae06ba154 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -376,6 +376,9 @@ DependsOnTargets="BuildRepoReferences" Inputs="$(MSBuildProjectFullPath)" Outputs="$(RepoCompletedSemaphorePath)Build.complete"> + + + From 73299513f8bd091da4d9395c99fdd3ffa68c5876 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 19:51:53 +0000 Subject: [PATCH 687/864] [main] Update dependencies from dotnet/sdk (#15929) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.3.23169.1 to 8.0.0-preview.4.23175.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.3.23169.1 to 8.0.0-preview.4.23175.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.3.23169.1 to 8.0.0-preview.4.23175.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.4.23174.2 to 8.0.0-preview.4.23176.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23169.1 to 8.0.0-preview.4.23175.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.3.23166.3 to 8.0.0-preview.4.23172.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.3.23169.1 to 8.0.0-preview.4.23175.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.3.23167.14 to 8.0.0-preview.4.23175.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23172.6 to 12.5.0-beta.23174.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23172.6 to 7.0.300-beta.23174.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23171-02 to 17.6.0-preview-23174-01 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.4.23174.4 to 8.0.0-preview.4.23176.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 46 ++++++++--------- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e2c2f6f0..100b67053 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - a27867a7347d595702e30cb25acb60b76f4614c3 + 0571e38e31758f5905cba053f0c759fd802c7f8c - + https://github.com/dotnet/windowsdesktop - a27867a7347d595702e30cb25acb60b76f4614c3 + 0571e38e31758f5905cba053f0c759fd802c7f8c - + https://github.com/dotnet/windowsdesktop - a27867a7347d595702e30cb25acb60b76f4614c3 + 0571e38e31758f5905cba053f0c759fd802c7f8c - + https://github.com/dotnet/windowsdesktop - a27867a7347d595702e30cb25acb60b76f4614c3 + 0571e38e31758f5905cba053f0c759fd802c7f8c - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 - + https://github.com/dotnet/aspnetcore - 520c18777aa51e4a56ca30554daf58ae492a03bf + c2350729d09a0db90cc6f5b1f11517f509e5db70 https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 5dcdf394dc01c681079fb777ae984f9149b056ef + c20074dc5212d7bf37bba4040e001ea64c5b3263 - + https://github.com/dotnet/sdk - 5dcdf394dc01c681079fb777ae984f9149b056ef + c20074dc5212d7bf37bba4040e001ea64c5b3263 - + https://github.com/dotnet/sdk - 5dcdf394dc01c681079fb777ae984f9149b056ef + c20074dc5212d7bf37bba4040e001ea64c5b3263 - + https://github.com/dotnet/sdk - 5dcdf394dc01c681079fb777ae984f9149b056ef + c20074dc5212d7bf37bba4040e001ea64c5b3263 - + https://github.com/dotnet/winforms - 1a220e9268d2d38f719d2cd721628fe6e270d2d2 + f777662b7d00d81e52255e3c3b699f401eaaea6c - + https://github.com/dotnet/wpf - 5d596bd99a06466c7b7aa67f7f66b108abad809a + cda43cae95e6110042bb69b7871a1e0ac927aa69 - + https://github.com/dotnet/fsharp - 54773808aed924ea6ba071b1a0dd1db8da3007cc + 0207bea1afae48d9351ac26fb51afc8260de0a97 - + https://github.com/dotnet/fsharp - 54773808aed924ea6ba071b1a0dd1db8da3007cc + 0207bea1afae48d9351ac26fb51afc8260de0a97 @@ -142,18 +142,18 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 96a003edd9e25a7b4b693b6a7717ad4d46937a8b + 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 - + https://github.com/dotnet/msbuild - b84faa7d0dfb42daedca5c244f73f0b07e1135d7 + e7de1330724224a542668e1ef82c997613c7080c diff --git a/eng/Versions.props b/eng/Versions.props index b305063ba..6a8283faa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.3.23166.3 + 8.0.0-preview.4.23172.4 - 8.0.0-preview.3.23167.14 + 8.0.0-preview.4.23175.2 @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 - 8.0.0-preview.4.23174.2 + 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23176.6 0.2.0 - 8.0.100-preview.4.23174.20 - 8.0.100-preview.4.23174.20 - 8.0.100-preview.4.23174.20 + 8.0.100-preview.4.23177.4 + 8.0.100-preview.4.23177.4 + 8.0.100-preview.4.23177.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,24 +91,24 @@ - 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23176.4 - 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.4 - 8.0.0-preview.4.23174.4 + 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23176.4 2.1.0 - 8.0.0-preview.3.23169.1 - 8.0.0-preview.3.23169.1 - 8.0.0-preview.3.23169.1 - 8.0.0-preview.3.23169.1 + 8.0.0-preview.4.23175.4 + 8.0.0-preview.4.23175.4 + 8.0.0-preview.4.23175.4 + 8.0.0-preview.4.23175.4 From ae1a977d710fec27632d14d2556eb8d4f2b203bf Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 27 Mar 2023 16:09:20 -0700 Subject: [PATCH 688/864] Update deployment-tools dependency --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 100b67053..e42f1c434 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,10 +170,10 @@ a464820353b7956538b07c9b53103d793b5e15b6 - + https://github.com/dotnet/deployment-tools - c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + b60c95e1ce736630d17e16626c59e3dd85ebae2b + https://github.com/dotnet/source-build-externals From 5dc8e1e1b9e64440c012921fc5c0a2e0d4319bb9 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 27 Mar 2023 18:28:12 -0700 Subject: [PATCH 689/864] Add another dependency --- eng/Version.Details.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e42f1c434..012eae1a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,6 +173,12 @@ https://github.com/dotnet/deployment-tools b60c95e1ce736630d17e16626c59e3dd85ebae2b + + + + https://github.com/dotnet/deployment-tools + b60c95e1ce736630d17e16626c59e3dd85ebae2b From 2276d99d03551f3baf61fcefbf9fecfc3eb11091 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 03:17:57 +0000 Subject: [PATCH 690/864] Update dependencies from https://github.com/dotnet/sdk build 20230327.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.3 -> To Version 7.0.300-preview.23177.21 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23171.5 -> To Version 4.6.0-2.23177.5 (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 972fe0888..d1cd7556e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df - + https://github.com/dotnet/sdk - bf00d9be88196ce70e2a863559c41f414406702c + 4970adfe3e684d9099e7e9b8128d2a1c29d951df @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 + 736845e610cbabd7a61b3777dadd899f677c70fd diff --git a/eng/Versions.props b/eng/Versions.props index eddee8a51..59c545992 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23177.3 - 7.0.300-preview.23177.3 - 7.0.300-preview.23177.3 + 7.0.300-preview.23177.21 + 7.0.300-preview.23177.21 + 7.0.300-preview.23177.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4c83306cc7a97f73f293f6e06a6115cae5e6896 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 07:43:38 +0000 Subject: [PATCH 691/864] Update dependencies from https://github.com/dotnet/sdk build 20230327.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.21 -> To Version 7.0.300-preview.23177.23 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-2.23177.5 -> To Version 4.6.0-2.23177.13 (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 d1cd7556e..77836fd17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 - + https://github.com/dotnet/sdk - 4970adfe3e684d9099e7e9b8128d2a1c29d951df + e42c93d8c5d8a7e762d26a9238f14c9764026c55 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 736845e610cbabd7a61b3777dadd899f677c70fd + 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 diff --git a/eng/Versions.props b/eng/Versions.props index 59c545992..32e2145c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23177.21 - 7.0.300-preview.23177.21 - 7.0.300-preview.23177.21 + 7.0.300-preview.23177.23 + 7.0.300-preview.23177.23 + 7.0.300-preview.23177.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6875ad0ce48e5cb83141655216d2f99cf35e133f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 08:51:13 +0000 Subject: [PATCH 692/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230328.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23177.1 -> To Version 8.0.0-alpha.1.23178.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 100b67053..e50875c3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 0d434a1f8c5d112adf6cfbaee93fea24b63a328a + df416d414a5dc55cef4e7f5fcc9b5e9d2f855480 From de6bcf791663c5f79c4c67f7ebc0ee831285e053 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 28 Mar 2023 08:08:19 -0500 Subject: [PATCH 693/864] Update SB prebuilts tarball version (#15936) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 56601bc3a..aeca39941 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-14.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-17.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz From dae2c7daa82c6914d70a9f30e42f964fe8521e34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 13:11:14 +0000 Subject: [PATCH 694/864] [main] Update dependencies from dotnet/sdk (#15937) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.4.23175.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.4.23175.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.4.23175.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.4.23176.6 to 8.0.0-preview.4.23177.14 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.4.23175.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.4.23175.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.4.23175.2 to 8.0.0-preview.4.23177.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23174.5 to 12.5.0-beta.23176.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23174.5 to 7.0.300-beta.23176.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-2.23171.5 to 4.6.0-2.23177.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.4.23176.4 to 8.0.0-preview.4.23177.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 46 ++++++++--------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e50875c3c..d7b893c7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 0571e38e31758f5905cba053f0c759fd802c7f8c + 62f733fe7abacbfc657b606eebd6844494cfc69a - + https://github.com/dotnet/windowsdesktop - 0571e38e31758f5905cba053f0c759fd802c7f8c + 62f733fe7abacbfc657b606eebd6844494cfc69a - + https://github.com/dotnet/windowsdesktop - 0571e38e31758f5905cba053f0c759fd802c7f8c + 62f733fe7abacbfc657b606eebd6844494cfc69a - + https://github.com/dotnet/windowsdesktop - 0571e38e31758f5905cba053f0c759fd802c7f8c + 62f733fe7abacbfc657b606eebd6844494cfc69a - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore - c2350729d09a0db90cc6f5b1f11517f509e5db70 + d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - c20074dc5212d7bf37bba4040e001ea64c5b3263 + d2d4bf5e37b72b21c94a60a33f70f3b107b2fead - + https://github.com/dotnet/sdk - c20074dc5212d7bf37bba4040e001ea64c5b3263 + d2d4bf5e37b72b21c94a60a33f70f3b107b2fead - + https://github.com/dotnet/sdk - c20074dc5212d7bf37bba4040e001ea64c5b3263 + d2d4bf5e37b72b21c94a60a33f70f3b107b2fead - + https://github.com/dotnet/sdk - c20074dc5212d7bf37bba4040e001ea64c5b3263 + d2d4bf5e37b72b21c94a60a33f70f3b107b2fead https://github.com/dotnet/winforms f777662b7d00d81e52255e3c3b699f401eaaea6c - + https://github.com/dotnet/wpf - cda43cae95e6110042bb69b7871a1e0ac927aa69 + 08940fbba6aed7b0edafb00914691035cf71cc7d - + https://github.com/dotnet/fsharp - 0207bea1afae48d9351ac26fb51afc8260de0a97 + 93562c0c97dda1fb131e8eaf73e35487a6998ee5 - + https://github.com/dotnet/fsharp - 0207bea1afae48d9351ac26fb51afc8260de0a97 + 93562c0c97dda1fb131e8eaf73e35487a6998ee5 @@ -142,13 +142,13 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 8d5f520838bbe2fe0ad02df53c85809fbbb1fcbb + beb708f6fe999cbbe5542846c9985ce596569097 - + https://github.com/dotnet/roslyn - 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 + 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 diff --git a/eng/Versions.props b/eng/Versions.props index 6a8283faa..1f44f72e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,7 +45,7 @@ - 8.0.0-preview.4.23175.2 + 8.0.0-preview.4.23177.1 @@ -65,50 +65,50 @@ - 8.0.0-preview.4.23176.6 - 8.0.0-preview.4.23176.6 - 8.0.0-preview.4.23176.6 - 8.0.0-preview.4.23176.6 - 8.0.0-preview.4.23176.6 - 8.0.0-preview.4.23176.6 - 8.0.0-preview.4.23176.6 + 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23177.14 0.2.0 - 8.0.100-preview.4.23177.4 - 8.0.100-preview.4.23177.4 - 8.0.100-preview.4.23177.4 + 8.0.100-preview.4.23178.2 + 8.0.100-preview.4.23178.2 + 8.0.100-preview.4.23178.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-2.23171.5 + 4.6.0-2.23177.13 - 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23176.4 - 8.0.0-preview.4.23176.4 - 8.0.0-preview.4.23176.4 - 8.0.0-preview.4.23176.4 - 8.0.0-preview.4.23176.4 - 8.0.0-preview.4.23176.4 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 2.1.0 - 8.0.0-preview.4.23175.4 - 8.0.0-preview.4.23175.4 - 8.0.0-preview.4.23175.4 - 8.0.0-preview.4.23175.4 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23177.1 From 39f7a7d61432e863283f6f0422a20f3ab308cfe6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 13:16:19 +0000 Subject: [PATCH 695/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15941) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7b893c7d..3871f8086 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,9 +212,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - df416d414a5dc55cef4e7f5fcc9b5e9d2f855480 + dc842f8fab4bd38db9334a312a990d198b971fc2 From cb35390c1bc7432abbb076e1fc88fae4ad00c75e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 28 Mar 2023 09:40:55 -0500 Subject: [PATCH 696/864] Clean n-1 SBRP packages after building SBRP (#15898) --- .../content/repo-projects/Directory.Build.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 01788e38e..8c7a2cfb5 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -332,6 +332,12 @@ + + + Date: Tue, 28 Mar 2023 16:42:58 +0200 Subject: [PATCH 697/864] Fix Ubuntu 20.04 artifact name in SDK diffing pipeline (#15942) --- eng/pipelines/source-build-sdk-diff-tests.yml | 2 +- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index a7563b7d4..ab1a4bed2 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -44,7 +44,7 @@ jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Ubuntu2004_Offline_MsftSdk - targetRid: ubuntu.2004-x64 + targetRid: ubuntu.20.04-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 916edbbf1..fd9e6b144 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -85,14 +85,14 @@ jobs: msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z "$msft_sdk_tarball_name" ]]; then - echo "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$(InstallerBuildId)&view=results' might have failed." + echo "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build https://dev.azure.com/dnceng/internal/_build/results?buildId=$(InstallerBuildId) might have failed." exit 1 fi sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;) if [[ -z "$sdk_tarball_name" ]]; then - echo "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build 'https://dev.azure.com/dnceng/internal/_build/results?buildId=$(DotnetDotnetBuildId)&view=results' might have failed" + echo "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build https://dev.azure.com/dnceng/internal/_build/results?buildId=$(DotnetDotnetBuildId) might have failed" exit 1 fi From 594ea20745b679ebee0a4cd8dd63818fbdd5d780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 28 Mar 2023 17:03:36 +0200 Subject: [PATCH 698/864] Assume recursive installer sync when no `vmr-sync.sh` arguments (#15854) --- .devcontainer/vmr-source-build/init.sh | 7 +------ eng/vmr-sync.sh | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.devcontainer/vmr-source-build/init.sh b/.devcontainer/vmr-source-build/init.sh index fa074612a..86ebf4065 100755 --- a/.devcontainer/vmr-source-build/init.sh +++ b/.devcontainer/vmr-source-build/init.sh @@ -25,11 +25,6 @@ vmr_branch=$(git -C "$installer_dir" log --pretty=format:'%D' HEAD^ \ | sed 's@origin/@@' \ | sed 's@,.*@@') -"$workspace_dir/synchronize-vmr.sh" \ - --repository "installer:$(git -C "$installer_dir" rev-parse HEAD)" \ - --recursive \ - --branch "$vmr_branch" \ - --remote "installer:$installer_dir" \ - --debug +"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug (cd "$vmr_dir" && ./prep.sh) diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index 272af664c..1bcfd09d4 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -14,17 +14,16 @@ ### folder to this to speed up your re-runs. ### ### USAGE: +### Synchronize current installer and all dependencies into a local VMR: +### ./vmr-sync.sh --vmr "$HOME/repos/dotnet" --tmp "$HOME/repos/tmp" +### ### Synchronize the VMR to a specific commit of dotnet/runtime using custom fork: ### ./vmr-sync.sh \ ### --repository runtime:e7e71da303af8dc97df99b098f21f526398c3943 \ ### --remote runtime:https://github.com/yourfork/runtime \ -### --tmp-dir "$HOME/repos/tmp" +### --tmp "$HOME/repos/tmp" ### ### Options: -### -r, --repository name:GIT_REF -### Required. Repository + git ref separated by colon to synchronize to. -### This can be a specific commit, branch, tag.. -### ### -t, --tmp, --tmp-dir PATH ### Required. Path to the temporary folder where repositories will be cloned ### @@ -49,6 +48,12 @@ ### This can be used to synchronize to a commit from a fork of the repository ### Example: 'runtime:https://github.com/yourfork/runtime' ### +### -r, --repository name:GIT_REF +### Optional. Repository + git ref separated by colon to synchronize to. +### This can be a specific commit, branch, tag. +### If not supplied, the revision of the parent installer repository of this script will be used (recursively). +### Example: 'runtime:my-branch-name' +### ### --tpn-template ### Optional. Template for the header of VMRs THIRD-PARTY-NOTICES file. ### Defaults to src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt @@ -178,9 +183,10 @@ fi # Sanitize the input +# Default when no repository is provided if [[ -z "$repository" ]]; then - fail "No repository to synchronize specified" - exit 1 + repository="installer:$(git -C "$installer_dir" rev-parse HEAD)" + recursive=true fi if [[ -z "$vmr_dir" ]]; then From 663f53de8a8cf1ca16a5c8e3d29978d6f5688ca3 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 28 Mar 2023 08:16:34 -0700 Subject: [PATCH 699/864] Adding CoherentParentDependency attribute to intermediate dependency --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 012eae1a5..f81261c34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,7 +176,7 @@ - + https://github.com/dotnet/deployment-tools b60c95e1ce736630d17e16626c59e3dd85ebae2b From 10365b497bf0a90bcbaa4c700a33ef8e9b025be1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 09:59:48 -0700 Subject: [PATCH 700/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15943) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d590ff2f8..b2d119fed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - dc842f8fab4bd38db9334a312a990d198b971fc2 + 60137c7c084e98ce5ab35473f9a5302b0a988d01 From fad97713cb7df91a54befc4b8dda6ad7f3f8c192 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 17:37:51 +0000 Subject: [PATCH 701/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.4 --- 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 b2d119fed..14a844885 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - d2d4bf5e37b72b21c94a60a33f70f3b107b2fead + 3e34299dff61129227b539b792973a7f7ad60d57 - + https://github.com/dotnet/sdk - d2d4bf5e37b72b21c94a60a33f70f3b107b2fead + 3e34299dff61129227b539b792973a7f7ad60d57 - + https://github.com/dotnet/sdk - d2d4bf5e37b72b21c94a60a33f70f3b107b2fead + 3e34299dff61129227b539b792973a7f7ad60d57 - + https://github.com/dotnet/sdk - d2d4bf5e37b72b21c94a60a33f70f3b107b2fead + 3e34299dff61129227b539b792973a7f7ad60d57 diff --git a/eng/Versions.props b/eng/Versions.props index 1f44f72e7..8fbe73ce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23178.2 - 8.0.100-preview.4.23178.2 - 8.0.100-preview.4.23178.2 + 8.0.100-preview.4.23178.4 + 8.0.100-preview.4.23178.4 + 8.0.100-preview.4.23178.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 128f18890c187d4691bbd5f0e60dba5620158c9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 18:39:35 +0000 Subject: [PATCH 702/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.6 --- 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 14a844885..ab35b594e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 3e34299dff61129227b539b792973a7f7ad60d57 + 26e295338265be0cc4290c40dff1b8ffb931c7b8 - + https://github.com/dotnet/sdk - 3e34299dff61129227b539b792973a7f7ad60d57 + 26e295338265be0cc4290c40dff1b8ffb931c7b8 - + https://github.com/dotnet/sdk - 3e34299dff61129227b539b792973a7f7ad60d57 + 26e295338265be0cc4290c40dff1b8ffb931c7b8 - + https://github.com/dotnet/sdk - 3e34299dff61129227b539b792973a7f7ad60d57 + 26e295338265be0cc4290c40dff1b8ffb931c7b8 diff --git a/eng/Versions.props b/eng/Versions.props index 8fbe73ce9..1fb30ef44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23178.4 - 8.0.100-preview.4.23178.4 - 8.0.100-preview.4.23178.4 + 8.0.100-preview.4.23178.6 + 8.0.100-preview.4.23178.6 + 8.0.100-preview.4.23178.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 497110be53dd8590216a6da23393726e617fa2be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 18:49:30 +0000 Subject: [PATCH 703/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.23 -> To Version 7.0.300-preview.23178.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23176.1 -> To Version 12.5.0-beta.23178.3 (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 77836fd17..9821835b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e - + https://github.com/dotnet/sdk - e42c93d8c5d8a7e762d26a9238f14c9764026c55 + 17dce84d331424e7632e9c33c76b1391ebbd627e @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 93562c0c97dda1fb131e8eaf73e35487a6998ee5 + 58b9455165940e09bd473ea6a352904da9537629 - + https://github.com/dotnet/fsharp - 93562c0c97dda1fb131e8eaf73e35487a6998ee5 + 58b9455165940e09bd473ea6a352904da9537629 diff --git a/eng/Versions.props b/eng/Versions.props index 32e2145c3..a4a3bc0e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23177.23 - 7.0.300-preview.23177.23 - 7.0.300-preview.23177.23 + 7.0.300-preview.23178.5 + 7.0.300-preview.23178.5 + 7.0.300-preview.23178.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1067f172a7220a933de60ddf69e8db62928bd32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 19:39:01 +0000 Subject: [PATCH 704/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.7 --- 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 ab35b594e..04588b1b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 26e295338265be0cc4290c40dff1b8ffb931c7b8 + a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 - + https://github.com/dotnet/sdk - 26e295338265be0cc4290c40dff1b8ffb931c7b8 + a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 - + https://github.com/dotnet/sdk - 26e295338265be0cc4290c40dff1b8ffb931c7b8 + a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 - + https://github.com/dotnet/sdk - 26e295338265be0cc4290c40dff1b8ffb931c7b8 + a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 diff --git a/eng/Versions.props b/eng/Versions.props index 1fb30ef44..293a13f5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23178.6 - 8.0.100-preview.4.23178.6 - 8.0.100-preview.4.23178.6 + 8.0.100-preview.4.23178.7 + 8.0.100-preview.4.23178.7 + 8.0.100-preview.4.23178.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce4a3f937c55f99eac0841c29f8f82140d010bbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Mar 2023 21:07:50 +0000 Subject: [PATCH 705/864] Update dependencies from https://github.com/dotnet/symreader build 20221003.2 Microsoft.SourceBuild.Intermediate.symreader From Version 1.4.0-beta2-21475-02 -> To Version 2.0.0-beta-22503-02 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2d119fed..32893c1d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ 4b8fe3ff0cfb2b38901803c798c647ca8123c222 - + https://github.com/dotnet/symreader - 7b9791daa3a3477eb22ec805946c9fff8b42d8ca + 0c29b7109c054bdc578e917515ae7e8635b9cb9d From e3bcf213661f1fef2ef11275fc7896d29a14c5d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 00:52:24 +0000 Subject: [PATCH 706/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.8 --- 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 04588b1b2..cecb1e460 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 + e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 - + https://github.com/dotnet/sdk - a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 + e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 - + https://github.com/dotnet/sdk - a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 + e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 - + https://github.com/dotnet/sdk - a821467d6ef6f4d3f9c3de8c468041d8c8d5b3b0 + e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 diff --git a/eng/Versions.props b/eng/Versions.props index 293a13f5c..44ee950b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23178.7 - 8.0.100-preview.4.23178.7 - 8.0.100-preview.4.23178.7 + 8.0.100-preview.4.23178.8 + 8.0.100-preview.4.23178.8 + 8.0.100-preview.4.23178.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ece2446cffc0df58b8e34acabd3bb6cab4dbc7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 02:54:40 +0000 Subject: [PATCH 707/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.9 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cecb1e460..f11e917e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 62f733fe7abacbfc657b606eebd6844494cfc69a - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 - + https://github.com/dotnet/aspnetcore - d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 + 138388372bb7c6e35fdfa679da740fabc275a688 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 + ea68fc7b5e6102eba0284f903efb7e1e613e50dd - + https://github.com/dotnet/sdk - e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 + ea68fc7b5e6102eba0284f903efb7e1e613e50dd - + https://github.com/dotnet/sdk - e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 + ea68fc7b5e6102eba0284f903efb7e1e613e50dd - + https://github.com/dotnet/sdk - e4aa9e44d3e4073117aa192b7518d9bc7eb37e58 + ea68fc7b5e6102eba0284f903efb7e1e613e50dd @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - beb708f6fe999cbbe5542846c9985ce596569097 + 49ae58ace038dbbd3d53147e08c9ac95b24a789f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 44ee950b3..d3985a8a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23177.14 - 8.0.0-preview.4.23177.14 - 8.0.0-preview.4.23177.14 - 8.0.0-preview.4.23177.14 - 8.0.0-preview.4.23177.14 - 8.0.0-preview.4.23177.14 - 8.0.0-preview.4.23177.14 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 0.2.0 - 8.0.100-preview.4.23178.8 - 8.0.100-preview.4.23178.8 - 8.0.100-preview.4.23178.8 + 8.0.100-preview.4.23178.9 + 8.0.100-preview.4.23178.9 + 8.0.100-preview.4.23178.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23178.6 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.6 2.1.0 From 9911fe76b58cdce37ef5dbda5916d5612e780a27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 03:20:13 +0000 Subject: [PATCH 708/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.23 -> To Version 7.0.300-preview.23178.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23176.1 -> To Version 12.5.0-beta.23178.3 (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 9821835b1..3d4c86eeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 - + https://github.com/dotnet/sdk - 17dce84d331424e7632e9c33c76b1391ebbd627e + 121cf0170743b38a1d8a5e81906badd9afa7cd67 @@ -149,9 +149,9 @@ 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 - + https://github.com/dotnet/msbuild - e7de1330724224a542668e1ef82c997613c7080c + ea90db2e418d5d4f9a8da1c6f46ae9a9a30971bd diff --git a/eng/Versions.props b/eng/Versions.props index a4a3bc0e2..37f9ed1a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23178.5 - 7.0.300-preview.23178.5 - 7.0.300-preview.23178.5 + 7.0.300-preview.23178.10 + 7.0.300-preview.23178.10 + 7.0.300-preview.23178.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9b759c6517762b7bb641d30c25a1316b2ca50f46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 03:44:29 +0000 Subject: [PATCH 709/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.11 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.6 (parent: Microsoft.NET.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 f11e917e0..e60e077c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - ea68fc7b5e6102eba0284f903efb7e1e613e50dd + 0716962902ad5e56252bfc41b35e66ea20cb3236 - + https://github.com/dotnet/sdk - ea68fc7b5e6102eba0284f903efb7e1e613e50dd + 0716962902ad5e56252bfc41b35e66ea20cb3236 - + https://github.com/dotnet/sdk - ea68fc7b5e6102eba0284f903efb7e1e613e50dd + 0716962902ad5e56252bfc41b35e66ea20cb3236 - + https://github.com/dotnet/sdk - ea68fc7b5e6102eba0284f903efb7e1e613e50dd + 0716962902ad5e56252bfc41b35e66ea20cb3236 diff --git a/eng/Versions.props b/eng/Versions.props index d3985a8a5..6c5d53292 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23178.9 - 8.0.100-preview.4.23178.9 - 8.0.100-preview.4.23178.9 + 8.0.100-preview.4.23178.11 + 8.0.100-preview.4.23178.11 + 8.0.100-preview.4.23178.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 12cd341876b818526287c295e9387b5f483bc6a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 04:23:29 +0000 Subject: [PATCH 710/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23177.23 -> To Version 7.0.300-preview.23178.12 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23176.1 -> To Version 12.5.0-beta.23178.3 (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 3d4c86eeb..59c0a4d12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 - + https://github.com/dotnet/sdk - 121cf0170743b38a1d8a5e81906badd9afa7cd67 + 5c188f1ed0aebaa7cd076776d702c26f67d47a78 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + cab05f9378364ce35d9c0fc32e11518090f29caa diff --git a/eng/Versions.props b/eng/Versions.props index 37f9ed1a4..0c5965273 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23178.10 - 7.0.300-preview.23178.10 - 7.0.300-preview.23178.10 + 7.0.300-preview.23178.12 + 7.0.300-preview.23178.12 + 7.0.300-preview.23178.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efe963492bc67d57de157b2f0d63b0a03f1d7f04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 06:29:43 +0000 Subject: [PATCH 711/864] Update dependencies from https://github.com/dotnet/sdk build 20230328.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23178.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e60e077c4..eb9daa744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 62f733fe7abacbfc657b606eebd6844494cfc69a + e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/windowsdesktop - 62f733fe7abacbfc657b606eebd6844494cfc69a + e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/windowsdesktop - 62f733fe7abacbfc657b606eebd6844494cfc69a + e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/windowsdesktop - 62f733fe7abacbfc657b606eebd6844494cfc69a + e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 0716962902ad5e56252bfc41b35e66ea20cb3236 + e561a1f7cfd790308aee046a6eef201ab2154797 - + https://github.com/dotnet/sdk - 0716962902ad5e56252bfc41b35e66ea20cb3236 + e561a1f7cfd790308aee046a6eef201ab2154797 - + https://github.com/dotnet/sdk - 0716962902ad5e56252bfc41b35e66ea20cb3236 + e561a1f7cfd790308aee046a6eef201ab2154797 - + https://github.com/dotnet/sdk - 0716962902ad5e56252bfc41b35e66ea20cb3236 + e561a1f7cfd790308aee046a6eef201ab2154797 - + https://github.com/dotnet/winforms - f777662b7d00d81e52255e3c3b699f401eaaea6c + d5c99d71d02787c42753807e2271d42a01d5b2ca - + https://github.com/dotnet/wpf - 08940fbba6aed7b0edafb00914691035cf71cc7d + 599cce2fff315dd2c6d712436e890837cdc3ff3e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c5d53292..8dc65248b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.4.23172.4 + 8.0.0-preview.4.23177.3 - 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23178.1 @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23178.11 - 8.0.100-preview.4.23178.11 - 8.0.100-preview.4.23178.11 + 8.0.100-preview.4.23178.13 + 8.0.100-preview.4.23178.13 + 8.0.100-preview.4.23178.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 - 8.0.0-preview.4.23177.1 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.3 From 9169b4a9c21bbb458bd4d4183475caecbeeb8b1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 09:22:53 +0000 Subject: [PATCH 712/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb9daa744..2d77b8ba5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 - + https://github.com/dotnet/aspnetcore - 138388372bb7c6e35fdfa679da740fabc275a688 + 3a6acd95c769bbbd2e5288d5844c81dee45fc958 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - e561a1f7cfd790308aee046a6eef201ab2154797 + c0626419cbde0091c40bc164658e34b44610d97e - + https://github.com/dotnet/sdk - e561a1f7cfd790308aee046a6eef201ab2154797 + c0626419cbde0091c40bc164658e34b44610d97e - + https://github.com/dotnet/sdk - e561a1f7cfd790308aee046a6eef201ab2154797 + c0626419cbde0091c40bc164658e34b44610d97e - + https://github.com/dotnet/sdk - e561a1f7cfd790308aee046a6eef201ab2154797 + c0626419cbde0091c40bc164658e34b44610d97e @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 49ae58ace038dbbd3d53147e08c9ac95b24a789f + 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8dc65248b..04c5cb996 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 - 8.0.0-preview.4.23178.3 + 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23178.4 0.2.0 - 8.0.100-preview.4.23178.13 - 8.0.100-preview.4.23178.13 - 8.0.100-preview.4.23178.13 + 8.0.100-preview.4.23179.1 + 8.0.100-preview.4.23179.1 + 8.0.100-preview.4.23179.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.13 - 8.0.0-preview.4.23178.6 - 8.0.0-preview.4.23178.6 - 8.0.0-preview.4.23178.6 - 8.0.0-preview.4.23178.6 - 8.0.0-preview.4.23178.6 - 8.0.0-preview.4.23178.6 + 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.13 2.1.0 From 62f31ab487eecb6ed3920329cc946ae58fb5f079 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 10:54:55 +0000 Subject: [PATCH 713/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23178.12 -> To Version 7.0.300-preview.23179.3 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23178-11 -> To Version 17.6.0-preview-23179-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 59c0a4d12..088dc3590 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f - + https://github.com/dotnet/sdk - 5c188f1ed0aebaa7cd076776d702c26f67d47a78 + 855dd0acbe5dd31481b7afc9508f97571706302f @@ -149,9 +149,9 @@ cab05f9378364ce35d9c0fc32e11518090f29caa - + https://github.com/dotnet/msbuild - ea90db2e418d5d4f9a8da1c6f46ae9a9a30971bd + dd5d9f746fe3ec521ed44c6f2b852740d25f51be diff --git a/eng/Versions.props b/eng/Versions.props index 0c5965273..93b90f0dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23178.12 - 7.0.300-preview.23178.12 - 7.0.300-preview.23178.12 + 7.0.300-preview.23179.3 + 7.0.300-preview.23179.3 + 7.0.300-preview.23179.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 19d1ea1d2db87ae411d0a6fb14c7511e73a6a5a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 12:27:49 +0000 Subject: [PATCH 714/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230328.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23171.1 -> To Version 8.0.0-alpha.1.23178.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32893c1d0..c7b3b14c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ b60c95e1ce736630d17e16626c59e3dd85ebae2b - + https://github.com/dotnet/source-build-externals - 4b8fe3ff0cfb2b38901803c798c647ca8123c222 + cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379 From cf0fb2cb6ff7aa622985b3e00f963414c27575d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 14:48:35 +0000 Subject: [PATCH 715/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (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 2d77b8ba5..12be137d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - c0626419cbde0091c40bc164658e34b44610d97e + c9ebc126377bf7e42e6879dcc79178bbae9a0e4c - + https://github.com/dotnet/sdk - c0626419cbde0091c40bc164658e34b44610d97e + c9ebc126377bf7e42e6879dcc79178bbae9a0e4c - + https://github.com/dotnet/sdk - c0626419cbde0091c40bc164658e34b44610d97e + c9ebc126377bf7e42e6879dcc79178bbae9a0e4c - + https://github.com/dotnet/sdk - c0626419cbde0091c40bc164658e34b44610d97e + c9ebc126377bf7e42e6879dcc79178bbae9a0e4c @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 599cce2fff315dd2c6d712436e890837cdc3ff3e - + https://github.com/dotnet/fsharp - 93562c0c97dda1fb131e8eaf73e35487a6998ee5 + 58b9455165940e09bd473ea6a352904da9537629 - + https://github.com/dotnet/fsharp - 93562c0c97dda1fb131e8eaf73e35487a6998ee5 + 58b9455165940e09bd473ea6a352904da9537629 diff --git a/eng/Versions.props b/eng/Versions.props index 04c5cb996..1ba8f5793 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23179.1 - 8.0.100-preview.4.23179.1 - 8.0.100-preview.4.23179.1 + 8.0.100-preview.4.23179.4 + 8.0.100-preview.4.23179.4 + 8.0.100-preview.4.23179.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3af87c5033dc590f7728254eeecec80ad521005c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 16:36:54 +0000 Subject: [PATCH 716/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230329.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23178.5 -> To Version 8.0.0-alpha.1.23179.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7b3b14c1..9d85945b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 60137c7c084e98ce5ab35473f9a5302b0a988d01 + bc5210a7b68c43bcf9d9687b9268a4665126c583 From 59fe62dcea014991467e759d947864d1db5e3d13 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 29 Mar 2023 17:14:30 +0000 Subject: [PATCH 717/864] Fix if statements --- src/SourceBuild/content/prep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 7149f2e3a..0207fe7e4 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -69,14 +69,14 @@ fi # Check if Private.SourceBuilt artifacts archive exists artifactsBaseFileName="Private.SourceBuilt.Artifacts" packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/" -if [[ "$downloadArtifacts" == "true" && -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]]; then +if [ "$downloadArtifacts" == "true" ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" downloadArtifacts=false fi # Check if Private.SourceBuilt prebuilts archive exists prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts" -if [[ "$downloadPrebuilts" == "true" && -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]]; then +if [ "$downloadPrebuilts" == "true" ] && [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded" downloadPrebuilts=false fi From 0135c7c20421566f9caf6d6c95e53e912d9dab30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 17:46:15 +0000 Subject: [PATCH 718/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12be137d3..c429cfeb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - c9ebc126377bf7e42e6879dcc79178bbae9a0e4c + ac661f789a31637176b23499cba0809f392584e2 - + https://github.com/dotnet/sdk - c9ebc126377bf7e42e6879dcc79178bbae9a0e4c + ac661f789a31637176b23499cba0809f392584e2 - + https://github.com/dotnet/sdk - c9ebc126377bf7e42e6879dcc79178bbae9a0e4c + ac661f789a31637176b23499cba0809f392584e2 - + https://github.com/dotnet/sdk - c9ebc126377bf7e42e6879dcc79178bbae9a0e4c + ac661f789a31637176b23499cba0809f392584e2 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 3e59d14a0434a23ccd5294f3bfd5d0869f036e6b + 9111203d54e91560d1f61720c71c34be76069d06 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1ba8f5793..b1c8b48da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23179.4 - 8.0.100-preview.4.23179.4 - 8.0.100-preview.4.23179.4 + 8.0.100-preview.4.23179.5 + 8.0.100-preview.4.23179.5 + 8.0.100-preview.4.23179.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.18 - 8.0.0-preview.4.23178.13 - 8.0.0-preview.4.23178.13 - 8.0.0-preview.4.23178.13 - 8.0.0-preview.4.23178.13 - 8.0.0-preview.4.23178.13 - 8.0.0-preview.4.23178.13 + 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23178.18 2.1.0 From 0339a58a230d3361bced2044c87419dac7161372 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 18:40:03 +0000 Subject: [PATCH 719/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.6 Dependency coherency updates NuGet.Build.Tasks From Version 6.6.0-preview.3.57 -> To Version 6.6.0-preview.3.58 (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 088dc3590..a62a97ecc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 - + https://github.com/dotnet/sdk - 855dd0acbe5dd31481b7afc9508f97571706302f + 1e18cce585f796a9dc3a7852885f09f16a736969 @@ -154,9 +154,9 @@ dd5d9f746fe3ec521ed44c6f2b852740d25f51be - + https://github.com/nuget/nuget.client - 80c3c74ca5c6d67912a19833e8cc2b10f875dc95 + 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe diff --git a/eng/Versions.props b/eng/Versions.props index 93b90f0dd..930f83be2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.3 - 7.0.300-preview.23179.3 - 7.0.300-preview.23179.3 + 7.0.300-preview.23179.6 + 7.0.300-preview.23179.6 + 7.0.300-preview.23179.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 64f2c4c1df704d332ff99f87cf4604555ae3098a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 19:41:06 +0000 Subject: [PATCH 720/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (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 c429cfeb7..3f7eafa0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - ac661f789a31637176b23499cba0809f392584e2 + ccd8ed9a99397199a7481c310be740e8727e50e2 - + https://github.com/dotnet/sdk - ac661f789a31637176b23499cba0809f392584e2 + ccd8ed9a99397199a7481c310be740e8727e50e2 - + https://github.com/dotnet/sdk - ac661f789a31637176b23499cba0809f392584e2 + ccd8ed9a99397199a7481c310be740e8727e50e2 - + https://github.com/dotnet/sdk - ac661f789a31637176b23499cba0809f392584e2 + ccd8ed9a99397199a7481c310be740e8727e50e2 @@ -156,9 +156,9 @@ e7de1330724224a542668e1ef82c997613c7080c - + https://github.com/nuget/nuget.client - 80c3c74ca5c6d67912a19833e8cc2b10f875dc95 + 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe diff --git a/eng/Versions.props b/eng/Versions.props index b1c8b48da..e343bff07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23179.5 - 8.0.100-preview.4.23179.5 - 8.0.100-preview.4.23179.5 + 8.0.100-preview.4.23179.8 + 8.0.100-preview.4.23179.8 + 8.0.100-preview.4.23179.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27bcdb7964267203c0502c43559f7e57985041f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 19:49:47 +0000 Subject: [PATCH 721/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.7 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.6.0-2.23178.8 -> To Version 4.6.0-3.23178.21 (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 a62a97ecc..f87c5462a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d - + https://github.com/dotnet/sdk - 1e18cce585f796a9dc3a7852885f09f16a736969 + 59ac74b5b3858e8675b2b0b05aa4321715657e9d @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - cab05f9378364ce35d9c0fc32e11518090f29caa + 1861e34dc30c2d6e1e668c5b3e3a7bf345158fbb diff --git a/eng/Versions.props b/eng/Versions.props index 930f83be2..249788740 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.6 - 7.0.300-preview.23179.6 - 7.0.300-preview.23179.6 + 7.0.300-preview.23179.7 + 7.0.300-preview.23179.7 + 7.0.300-preview.23179.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6cb1a98b1f92c65fda0702cc0f2fa9982f1ac30b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 20:50:17 +0000 Subject: [PATCH 722/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 3f7eafa0a..265715ea0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - ccd8ed9a99397199a7481c310be740e8727e50e2 + 99733315574ee70eab70dde29bdf0e7ba6a3d3be - + https://github.com/dotnet/sdk - ccd8ed9a99397199a7481c310be740e8727e50e2 + 99733315574ee70eab70dde29bdf0e7ba6a3d3be - + https://github.com/dotnet/sdk - ccd8ed9a99397199a7481c310be740e8727e50e2 + 99733315574ee70eab70dde29bdf0e7ba6a3d3be - + https://github.com/dotnet/sdk - ccd8ed9a99397199a7481c310be740e8727e50e2 + 99733315574ee70eab70dde29bdf0e7ba6a3d3be diff --git a/eng/Versions.props b/eng/Versions.props index e343bff07..a5202a19a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23179.8 - 8.0.100-preview.4.23179.8 - 8.0.100-preview.4.23179.8 + 8.0.100-preview.4.23179.10 + 8.0.100-preview.4.23179.10 + 8.0.100-preview.4.23179.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 145f04e872f439bb7ad42912380db7d015a3d9de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 20:58:49 +0000 Subject: [PATCH 723/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.6.0-2.23178.8 -> To Version 4.6.0-3.23178.21 (parent: Microsoft.NET.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 f87c5462a..1a4443982 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c - + https://github.com/dotnet/sdk - 59ac74b5b3858e8675b2b0b05aa4321715657e9d + 83ab231d9865b0002711a523c28fe22c917cda0c diff --git a/eng/Versions.props b/eng/Versions.props index 249788740..f6fde53f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.7 - 7.0.300-preview.23179.7 - 7.0.300-preview.23179.7 + 7.0.300-preview.23179.9 + 7.0.300-preview.23179.9 + 7.0.300-preview.23179.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b85c53f7d0e148a8536462f1b814d378fad62f67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Mar 2023 22:06:07 +0000 Subject: [PATCH 724/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.3 -> To Version 7.0.300-preview.23179.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.6.0-2.23178.8 -> To Version 4.6.0-3.23178.21 (parent: Microsoft.NET.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 1a4443982..ea63b950a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 - + https://github.com/dotnet/sdk - 83ab231d9865b0002711a523c28fe22c917cda0c + 994ce60024d32f51e5872afceadcfce425208977 diff --git a/eng/Versions.props b/eng/Versions.props index f6fde53f5..a052a0d99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.9 - 7.0.300-preview.23179.9 - 7.0.300-preview.23179.9 + 7.0.300-preview.23179.11 + 7.0.300-preview.23179.11 + 7.0.300-preview.23179.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b5a274f5e725e17927ba3a4e64fdee6dd1600b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 01:29:39 +0000 Subject: [PATCH 725/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 265715ea0..ceb0f4605 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f - + https://github.com/dotnet/aspnetcore - 3a6acd95c769bbbd2e5288d5844c81dee45fc958 + 61787bcae811496c6cb1ba6cb789f69e3054585f https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 99733315574ee70eab70dde29bdf0e7ba6a3d3be + 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 - + https://github.com/dotnet/sdk - 99733315574ee70eab70dde29bdf0e7ba6a3d3be + 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 - + https://github.com/dotnet/sdk - 99733315574ee70eab70dde29bdf0e7ba6a3d3be + 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 - + https://github.com/dotnet/sdk - 99733315574ee70eab70dde29bdf0e7ba6a3d3be + 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 9111203d54e91560d1f61720c71c34be76069d06 + 8e5c4a78de75dc32766eaca2c41eed2a28afa60d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a5202a19a..229f310e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23178.4 - 8.0.0-preview.4.23178.4 - 8.0.0-preview.4.23178.4 - 8.0.0-preview.4.23178.4 - 8.0.0-preview.4.23178.4 - 8.0.0-preview.4.23178.4 - 8.0.0-preview.4.23178.4 + 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.3 0.2.0 - 8.0.100-preview.4.23179.10 - 8.0.100-preview.4.23179.10 - 8.0.100-preview.4.23179.10 + 8.0.100-preview.4.23179.12 + 8.0.100-preview.4.23179.12 + 8.0.100-preview.4.23179.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23179.4 - 8.0.0-preview.4.23178.18 - 8.0.0-preview.4.23178.18 - 8.0.0-preview.4.23178.18 - 8.0.0-preview.4.23178.18 - 8.0.0-preview.4.23178.18 - 8.0.0-preview.4.23178.18 + 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.4 2.1.0 From bdcab863f8267473db47d3c7acf8d2039154a3f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 03:12:40 +0000 Subject: [PATCH 726/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.11 -> To Version 7.0.300-preview.23179.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23178.3 -> To Version 12.5.0-beta.23179.5 (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 ea63b950a..00b2d957b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 - + https://github.com/dotnet/sdk - 994ce60024d32f51e5872afceadcfce425208977 + 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 58b9455165940e09bd473ea6a352904da9537629 + 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 - + https://github.com/dotnet/fsharp - 58b9455165940e09bd473ea6a352904da9537629 + 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 diff --git a/eng/Versions.props b/eng/Versions.props index a052a0d99..94a0b6f9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.11 - 7.0.300-preview.23179.11 - 7.0.300-preview.23179.11 + 7.0.300-preview.23179.13 + 7.0.300-preview.23179.13 + 7.0.300-preview.23179.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc1f15afa08640615e060472cda849553b371557 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 05:10:58 +0000 Subject: [PATCH 727/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ceb0f4605..7a0fa88b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 - + https://github.com/dotnet/aspnetcore - 61787bcae811496c6cb1ba6cb789f69e3054585f + c0acf059eddd7e70498804dcc99a7c7b33732417 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 + 927976887789586bf081526b7b34ab8e826bf18a - + https://github.com/dotnet/sdk - 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 + 927976887789586bf081526b7b34ab8e826bf18a - + https://github.com/dotnet/sdk - 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 + 927976887789586bf081526b7b34ab8e826bf18a - + https://github.com/dotnet/sdk - 4de3a0b29eeb9c21ceb2c0ad9c81ff12e8cb4999 + 927976887789586bf081526b7b34ab8e826bf18a @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 8e5c4a78de75dc32766eaca2c41eed2a28afa60d + db93e0322678977e313de1e59f50b5136b4df88d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 229f310e1..e422cd480 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23179.3 - 8.0.0-preview.4.23179.3 - 8.0.0-preview.4.23179.3 - 8.0.0-preview.4.23179.3 - 8.0.0-preview.4.23179.3 - 8.0.0-preview.4.23179.3 - 8.0.0-preview.4.23179.3 + 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23179.5 0.2.0 - 8.0.100-preview.4.23179.12 - 8.0.100-preview.4.23179.12 - 8.0.100-preview.4.23179.12 + 8.0.100-preview.4.23179.14 + 8.0.100-preview.4.23179.14 + 8.0.100-preview.4.23179.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.12 - 8.0.0-preview.4.23179.4 - 8.0.0-preview.4.23179.4 - 8.0.0-preview.4.23179.4 - 8.0.0-preview.4.23179.4 - 8.0.0-preview.4.23179.4 - 8.0.0-preview.4.23179.4 + 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.12 2.1.0 From b3a7afcb82915139ec8b237d656133c8027e51a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 07:42:52 +0000 Subject: [PATCH 728/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.13 -> To Version 7.0.300-preview.23179.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23179.5 -> To Version 12.5.0-beta.23179.6 (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 00b2d957b..cccdfbb76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 - + https://github.com/dotnet/sdk - 2aabea0f654aef18f792f99c03c56c4c8c3a2dd6 + 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 + 7681004e60fa33211ed2690d38796788ce4a2df8 - + https://github.com/dotnet/fsharp - 97b1ee7f9de85aa66cb9883febbfffb6ca282ce9 + 7681004e60fa33211ed2690d38796788ce4a2df8 diff --git a/eng/Versions.props b/eng/Versions.props index 94a0b6f9c..4a2e62a14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.13 - 7.0.300-preview.23179.13 - 7.0.300-preview.23179.13 + 7.0.300-preview.23179.16 + 7.0.300-preview.23179.16 + 7.0.300-preview.23179.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae02fb980fe451962758e2e046ae43a47212b710 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 08:01:07 +0000 Subject: [PATCH 729/864] Update dependencies from https://github.com/dotnet/sdk build 20230329.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23179.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a0fa88b8..e90a3be22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 927976887789586bf081526b7b34ab8e826bf18a + ec824c9797659318c772330cb176286643a25dfe - + https://github.com/dotnet/sdk - 927976887789586bf081526b7b34ab8e826bf18a + ec824c9797659318c772330cb176286643a25dfe - + https://github.com/dotnet/sdk - 927976887789586bf081526b7b34ab8e826bf18a + ec824c9797659318c772330cb176286643a25dfe - + https://github.com/dotnet/sdk - 927976887789586bf081526b7b34ab8e826bf18a + ec824c9797659318c772330cb176286643a25dfe @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - db93e0322678977e313de1e59f50b5136b4df88d + 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index e422cd480..5382f31c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23179.14 - 8.0.100-preview.4.23179.14 - 8.0.100-preview.4.23179.14 + 8.0.100-preview.4.23179.17 + 8.0.100-preview.4.23179.17 + 8.0.100-preview.4.23179.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.13 - 8.0.0-preview.4.23179.12 - 8.0.0-preview.4.23179.12 - 8.0.0-preview.4.23179.12 - 8.0.0-preview.4.23179.12 - 8.0.0-preview.4.23179.12 - 8.0.0-preview.4.23179.12 + 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23179.13 2.1.0 From 7c24071b75057c1324a31cb7560036f8ab300aba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 10:24:56 +0000 Subject: [PATCH 730/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23179.15 (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 cccdfbb76..78590d54d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 1861e34dc30c2d6e1e668c5b3e3a7bf345158fbb + daad346cf905e453a7bb5561dbeb0b1be24a09ca diff --git a/eng/Versions.props b/eng/Versions.props index 4a2e62a14..4b419dd9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.16 - 7.0.300-preview.23179.16 - 7.0.300-preview.23179.16 + 7.0.300-preview.23180.1 + 7.0.300-preview.23180.1 + 7.0.300-preview.23180.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1058636ca0a83ccdfae8b1bd38535b8337e3a574 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 12:23:13 +0000 Subject: [PATCH 731/864] Update dependencies from https://github.com/dotnet/arcade build 20230327.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23174.1 -> To Version 8.0.0-beta.23177.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23172-02 -> To Version 1.2.0-beta-23175-02 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d85945b0..4de3f5618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 1177b37e60c7271ab461098aefbdd03edc15b90d + 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade - 1177b37e60c7271ab461098aefbdd03edc15b90d + 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade - 1177b37e60c7271ab461098aefbdd03edc15b90d + 747f53d751983dd062f39f4654bff074536e0012 https://github.com/dotnet/arcade-services @@ -223,14 +223,14 @@ bc5210a7b68c43bcf9d9687b9268a4665126c583 - + https://github.com/dotnet/sourcelink - a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3 + ccfca8dce5f7525433756281c2c275386348a9ad - + https://github.com/dotnet/xliff-tasks - f2ad3b152aac2a3f1c620178e9004b1f84ccfd1d + f8afbbadc5b87ae70b8993f4a9cfa54fb820d6ce diff --git a/eng/Versions.props b/eng/Versions.props index 1f44f72e7..d77fd40ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23174.1 + 8.0.0-beta.23177.4 diff --git a/global.json b/global.json index df9ab0d5a..93b4ed949 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23174.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23174.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4" } } From 6af27326cfe3114e7089b8644385c82abb20e254 Mon Sep 17 00:00:00 2001 From: Ilya Leoshkevich Date: Thu, 30 Mar 2023 16:59:14 +0200 Subject: [PATCH 732/864] Support private feeds in prep.sh (#14330) Co-authored-by: Michael Simons --- src/SourceBuild/content/prep.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 0207fe7e4..bbe545d0d 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -10,10 +10,13 @@ usage() { echo " Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and" echo " installing the version of dotnet referenced in global.json" echo "options:" - echo " --no-artifacts Exclude the download of the previously source-built artifacts archive." - echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" - echo " --no-prebuilts Exclude the download of the prebuilts archive." - echo " --no-sdk Exclude the download of the .NET SDK." + echo " --no-artifacts Exclude the download of the previously source-built artifacts archive." + echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" + echo " --no-prebuilts Exclude the download of the prebuilts archive." + echo " --no-sdk Exclude the download of the .NET SDK." + echo " --runtime-source-feed URL of a remote server or a local directory, from which SDKs and" + echo " runtimes can be downloaded" + echo " --runtime-source-feed-key Key for accessing the above server, if necessary" echo "" } @@ -21,6 +24,8 @@ buildBootstrap=true downloadArtifacts=true downloadPrebuilts=true installDotnet=true +runtime_source_feed='' +runtime_source_feed_key='' positional_args=() while :; do if [ $# -le 0 ]; then @@ -44,6 +49,14 @@ while :; do --no-sdk) installDotnet=false ;; + --runtime-source-feed) + runtime_source_feed=$2 + shift + ;; + --runtime-source-feed-key) + runtime_source_feed_key=$2 + shift + ;; *) positional_args+=("$1") ;; From f488b24e22ddac54d153b2432c38c171cefe233e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 18:14:45 +0000 Subject: [PATCH 733/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (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 e90a3be22..beb42ab34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - ec824c9797659318c772330cb176286643a25dfe + 4e1744bcca0eac99be9ad398c25da3dd5b98a09a - + https://github.com/dotnet/sdk - ec824c9797659318c772330cb176286643a25dfe + 4e1744bcca0eac99be9ad398c25da3dd5b98a09a - + https://github.com/dotnet/sdk - ec824c9797659318c772330cb176286643a25dfe + 4e1744bcca0eac99be9ad398c25da3dd5b98a09a - + https://github.com/dotnet/sdk - ec824c9797659318c772330cb176286643a25dfe + 4e1744bcca0eac99be9ad398c25da3dd5b98a09a @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 599cce2fff315dd2c6d712436e890837cdc3ff3e - + https://github.com/dotnet/fsharp - 58b9455165940e09bd473ea6a352904da9537629 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d - + https://github.com/dotnet/fsharp - 58b9455165940e09bd473ea6a352904da9537629 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d diff --git a/eng/Versions.props b/eng/Versions.props index 5382f31c7..0d353ee64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23179.17 - 8.0.100-preview.4.23179.17 - 8.0.100-preview.4.23179.17 + 8.0.100-preview.4.23180.2 + 8.0.100-preview.4.23180.2 + 8.0.100-preview.4.23180.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6c6f161441232c79c58895320c2d6b7fc4e00d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 18:54:51 +0000 Subject: [PATCH 734/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23179.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 +++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..62cb9d6ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78590d54d..efa731d06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 @@ -149,9 +149,9 @@ daad346cf905e453a7bb5561dbeb0b1be24a09ca - + https://github.com/dotnet/msbuild - dd5d9f746fe3ec521ed44c6f2b852740d25f51be + 61dd6568446aff7602d37e6a15595371fa057012 diff --git a/eng/Versions.props b/eng/Versions.props index 4b419dd9e..6f777006c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.1 - 7.0.300-preview.23180.1 - 7.0.300-preview.23180.1 + 7.0.300-preview.23180.3 + 7.0.300-preview.23180.3 + 7.0.300-preview.23180.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32fd66343fe9524f8f0c7d33d6c4c07d328dad6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 19:24:39 +0000 Subject: [PATCH 735/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 beb42ab34..ed3302b59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4e1744bcca0eac99be9ad398c25da3dd5b98a09a + f373d0933b0521228de5f1adb263d86409421ff2 - + https://github.com/dotnet/sdk - 4e1744bcca0eac99be9ad398c25da3dd5b98a09a + f373d0933b0521228de5f1adb263d86409421ff2 - + https://github.com/dotnet/sdk - 4e1744bcca0eac99be9ad398c25da3dd5b98a09a + f373d0933b0521228de5f1adb263d86409421ff2 - + https://github.com/dotnet/sdk - 4e1744bcca0eac99be9ad398c25da3dd5b98a09a + f373d0933b0521228de5f1adb263d86409421ff2 diff --git a/eng/Versions.props b/eng/Versions.props index 0d353ee64..83e717d7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23180.2 - 8.0.100-preview.4.23180.2 - 8.0.100-preview.4.23180.2 + 8.0.100-preview.4.23180.4 + 8.0.100-preview.4.23180.4 + 8.0.100-preview.4.23180.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a96c39b6a9cd350eb54a0c3a2af388dae036388 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 20:31:49 +0000 Subject: [PATCH 736/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 ed3302b59..07d8c1826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - f373d0933b0521228de5f1adb263d86409421ff2 + ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 - + https://github.com/dotnet/sdk - f373d0933b0521228de5f1adb263d86409421ff2 + ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 - + https://github.com/dotnet/sdk - f373d0933b0521228de5f1adb263d86409421ff2 + ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 - + https://github.com/dotnet/sdk - f373d0933b0521228de5f1adb263d86409421ff2 + ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 diff --git a/eng/Versions.props b/eng/Versions.props index 83e717d7b..7e5513440 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23180.4 - 8.0.100-preview.4.23180.4 - 8.0.100-preview.4.23180.4 + 8.0.100-preview.4.23180.5 + 8.0.100-preview.4.23180.5 + 8.0.100-preview.4.23180.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf2718da56fe4d100d092de22772ac5905465adc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 30 Mar 2023 15:56:51 -0500 Subject: [PATCH 737/864] Remove SourceBuildTarball usage in Version.Details.xml (#15960) --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d85945b0..f75e9a8e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,7 +63,7 @@ https://github.com/dotnet/aspnetcore d4be4957c24c7c8b745ade4cbaf290ad9cad1ad2 - + https://github.com/dotnet/aspnetcore @@ -154,7 +154,7 @@ https://github.com/dotnet/msbuild e7de1330724224a542668e1ef82c997613c7080c - + https://github.com/nuget/nuget.client @@ -221,7 +221,7 @@ https://github.com/dotnet/source-build-reference-packages bc5210a7b68c43bcf9d9687b9268a4665126c583 - + https://github.com/dotnet/sourcelink From ae01b865bcfd1890b917040b02c238594f3358f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 21:19:32 +0000 Subject: [PATCH 738/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07d8c1826..4e8374bd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c - + https://github.com/dotnet/aspnetcore - c0acf059eddd7e70498804dcc99a7c7b33732417 + 83728cac8c2feb5b81f2402c3d83c32f9239c22c https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 + 3e643cacec028343f4c9644dc52e7edd6cbeda94 - + https://github.com/dotnet/sdk - ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 + 3e643cacec028343f4c9644dc52e7edd6cbeda94 - + https://github.com/dotnet/sdk - ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 + 3e643cacec028343f4c9644dc52e7edd6cbeda94 - + https://github.com/dotnet/sdk - ecd6ceaf0dd59e8d2a06fec66e891570ab41e706 + 3e643cacec028343f4c9644dc52e7edd6cbeda94 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 2d90e251f9f6c4509de6641a6bc39ac7a35cc032 + e43ddbf9dcf52d643a0714f0668b2ab978f0b386 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7e5513440..2960b8103 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23179.5 - 8.0.0-preview.4.23179.5 - 8.0.0-preview.4.23179.5 - 8.0.0-preview.4.23179.5 - 8.0.0-preview.4.23179.5 - 8.0.0-preview.4.23179.5 - 8.0.0-preview.4.23179.5 + 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.2 0.2.0 - 8.0.100-preview.4.23180.5 - 8.0.100-preview.4.23180.5 - 8.0.100-preview.4.23180.5 + 8.0.100-preview.4.23180.6 + 8.0.100-preview.4.23180.6 + 8.0.100-preview.4.23180.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23180.1 - 8.0.0-preview.4.23179.13 - 8.0.0-preview.4.23179.13 - 8.0.0-preview.4.23179.13 - 8.0.0-preview.4.23179.13 - 8.0.0-preview.4.23179.13 - 8.0.0-preview.4.23179.13 + 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.1 2.1.0 From 5d012826602bd3b5c80c4302e4f38ea4bdb9905c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 23:33:07 +0000 Subject: [PATCH 739/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 4e8374bd3..2ac53bdd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 3e643cacec028343f4c9644dc52e7edd6cbeda94 + 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 - + https://github.com/dotnet/sdk - 3e643cacec028343f4c9644dc52e7edd6cbeda94 + 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 - + https://github.com/dotnet/sdk - 3e643cacec028343f4c9644dc52e7edd6cbeda94 + 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 - + https://github.com/dotnet/sdk - 3e643cacec028343f4c9644dc52e7edd6cbeda94 + 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 diff --git a/eng/Versions.props b/eng/Versions.props index 2960b8103..5513d7e3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23180.6 - 8.0.100-preview.4.23180.6 - 8.0.100-preview.4.23180.6 + 8.0.100-preview.4.23180.7 + 8.0.100-preview.4.23180.7 + 8.0.100-preview.4.23180.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15ebd54c3466ea3e6232472a3d1930ebe336510d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 03:13:50 +0000 Subject: [PATCH 740/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23180.6 (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 efa731d06..3c8014f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - daad346cf905e453a7bb5561dbeb0b1be24a09ca + 99e956e42697a6dd886d1e12478ea2b27cceacfa diff --git a/eng/Versions.props b/eng/Versions.props index 6f777006c..a4ef7c925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.3 - 7.0.300-preview.23180.3 - 7.0.300-preview.23180.3 + 7.0.300-preview.23180.8 + 7.0.300-preview.23180.8 + 7.0.300-preview.23180.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee24ec052c942f14699816349c5ee6ae403b0af1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 03:36:47 +0000 Subject: [PATCH 741/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c930bc426..fb86e3fc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime e43ddbf9dcf52d643a0714f0668b2ab978f0b386 - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f - + https://github.com/dotnet/aspnetcore - 83728cac8c2feb5b81f2402c3d83c32f9239c22c + e646901bfd855cb0a25ce0554aa4a42c39b14f4f https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 + 0da7a37809fc4fadd98d78c7294b65b48dcf825a - + https://github.com/dotnet/sdk - 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 + 0da7a37809fc4fadd98d78c7294b65b48dcf825a - + https://github.com/dotnet/sdk - 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 + 0da7a37809fc4fadd98d78c7294b65b48dcf825a - + https://github.com/dotnet/sdk - 0a6301c4b8eaf37bc98c8c3cb222add53ef672c8 + 0da7a37809fc4fadd98d78c7294b65b48dcf825a diff --git a/eng/Versions.props b/eng/Versions.props index 194d261c7..f9d078bc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23180.2 - 8.0.0-preview.4.23180.2 - 8.0.0-preview.4.23180.2 - 8.0.0-preview.4.23180.2 - 8.0.0-preview.4.23180.2 - 8.0.0-preview.4.23180.2 - 8.0.0-preview.4.23180.2 + 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23180.5 0.2.0 - 8.0.100-preview.4.23180.7 - 8.0.100-preview.4.23180.7 - 8.0.100-preview.4.23180.7 + 8.0.100-preview.4.23180.9 + 8.0.100-preview.4.23180.9 + 8.0.100-preview.4.23180.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7828afa1fb337646531229c2be2875f2fe44d5da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 04:17:33 +0000 Subject: [PATCH 742/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.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 3c8014f47..7314ffd31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 7681004e60fa33211ed2690d38796788ce4a2df8 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d - + https://github.com/dotnet/fsharp - 7681004e60fa33211ed2690d38796788ce4a2df8 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d diff --git a/eng/Versions.props b/eng/Versions.props index a4ef7c925..3d5375e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.8 - 7.0.300-preview.23180.8 - 7.0.300-preview.23180.8 + 7.0.300-preview.23180.10 + 7.0.300-preview.23180.10 + 7.0.300-preview.23180.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 92657affa1c666996b4231afaa1823d816d29b33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 04:44:11 +0000 Subject: [PATCH 743/864] Update dependencies from https://github.com/dotnet/sdk build 20230330.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23180.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb86e3fc6..b6f1a3220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 0da7a37809fc4fadd98d78c7294b65b48dcf825a + 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 - + https://github.com/dotnet/sdk - 0da7a37809fc4fadd98d78c7294b65b48dcf825a + 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 - + https://github.com/dotnet/sdk - 0da7a37809fc4fadd98d78c7294b65b48dcf825a + 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 - + https://github.com/dotnet/sdk - 0da7a37809fc4fadd98d78c7294b65b48dcf825a + 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - e43ddbf9dcf52d643a0714f0668b2ab978f0b386 + 62d6a8fe599ea3a77ef7af3c7660d398d692f062 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f9d078bc8..8db053f35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23180.9 - 8.0.100-preview.4.23180.9 - 8.0.100-preview.4.23180.9 + 8.0.100-preview.4.23180.11 + 8.0.100-preview.4.23180.11 + 8.0.100-preview.4.23180.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.9 - 8.0.0-preview.4.23180.1 - 8.0.0-preview.4.23180.1 - 8.0.0-preview.4.23180.1 - 8.0.0-preview.4.23180.1 - 8.0.0-preview.4.23180.1 - 8.0.0-preview.4.23180.1 + 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.9 2.1.0 From 37ea9155034af77a71f1707e5d8988a94f34bb54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 09:06:21 +0000 Subject: [PATCH 744/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23181.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6f1a3220..c86dcdb93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 + 89c1630f459d2e0f03cdd0a13e6b824715802610 - + https://github.com/dotnet/sdk - 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 + 89c1630f459d2e0f03cdd0a13e6b824715802610 - + https://github.com/dotnet/sdk - 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 + 89c1630f459d2e0f03cdd0a13e6b824715802610 - + https://github.com/dotnet/sdk - 4556dec242f1e6e4c93d9c8aa8df926d5efd4690 + 89c1630f459d2e0f03cdd0a13e6b824715802610 @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 62d6a8fe599ea3a77ef7af3c7660d398d692f062 + 2323fc8513c9f5e60683cf4aa90475b44a550170 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8db053f35..ac51388ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23180.11 - 8.0.100-preview.4.23180.11 - 8.0.100-preview.4.23180.11 + 8.0.100-preview.4.23181.2 + 8.0.100-preview.4.23181.2 + 8.0.100-preview.4.23181.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.13 - 8.0.0-preview.4.23180.9 - 8.0.0-preview.4.23180.9 - 8.0.0-preview.4.23180.9 - 8.0.0-preview.4.23180.9 - 8.0.0-preview.4.23180.9 - 8.0.0-preview.4.23180.9 + 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23180.13 2.1.0 From 860b98a189c58d45dac3b71b7f57932f60a24289 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 09:29:06 +0000 Subject: [PATCH 745/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23181.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.1 (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 7314ffd31..881c9ec7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 @@ -154,9 +154,9 @@ 61dd6568446aff7602d37e6a15595371fa057012 - + https://github.com/nuget/nuget.client - 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe + 0fa557836fa35aee7d60776ef0c88176dbcd22ac diff --git a/eng/Versions.props b/eng/Versions.props index 3d5375e4c..4f7f6487a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.10 - 7.0.300-preview.23180.10 - 7.0.300-preview.23180.10 + 7.0.300-preview.23181.1 + 7.0.300-preview.23181.1 + 7.0.300-preview.23181.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f1fd4f4446cbfb47ada888bc3ad536c531676b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 31 Mar 2023 02:36:26 -0700 Subject: [PATCH 746/864] Fix permissions on `init.sh` for VMR's codespace (#15962) --- src/SourceBuild/content/.devcontainer/init.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/SourceBuild/content/.devcontainer/init.sh diff --git a/src/SourceBuild/content/.devcontainer/init.sh b/src/SourceBuild/content/.devcontainer/init.sh old mode 100644 new mode 100755 From 8470339bc6edf7c6962fbeea19f1423ff47ba9f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 10:23:11 +0000 Subject: [PATCH 747/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23181.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (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 c86dcdb93..7720b421b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 89c1630f459d2e0f03cdd0a13e6b824715802610 + 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 - + https://github.com/dotnet/sdk - 89c1630f459d2e0f03cdd0a13e6b824715802610 + 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 - + https://github.com/dotnet/sdk - 89c1630f459d2e0f03cdd0a13e6b824715802610 + 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 - + https://github.com/dotnet/sdk - 89c1630f459d2e0f03cdd0a13e6b824715802610 + 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 @@ -156,9 +156,9 @@ e7de1330724224a542668e1ef82c997613c7080c - + https://github.com/nuget/nuget.client - 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe + 0fa557836fa35aee7d60776ef0c88176dbcd22ac diff --git a/eng/Versions.props b/eng/Versions.props index ac51388ac..6f65932a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23181.2 - 8.0.100-preview.4.23181.2 - 8.0.100-preview.4.23181.2 + 8.0.100-preview.4.23181.3 + 8.0.100-preview.4.23181.3 + 8.0.100-preview.4.23181.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1960b608ee8f400432a52a062ba1e695247df156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 11:00:09 +0000 Subject: [PATCH 748/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23181.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.1 (parent: Microsoft.NET.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 881c9ec7e..df816c265 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 diff --git a/eng/Versions.props b/eng/Versions.props index 4f7f6487a..8128e226b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23181.1 - 7.0.300-preview.23181.1 - 7.0.300-preview.23181.1 + 7.0.300-preview.23181.4 + 7.0.300-preview.23181.4 + 7.0.300-preview.23181.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed7d909c660589f5f18c740462a68558b6e8ab69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 11:25:41 +0000 Subject: [PATCH 749/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23181.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7720b421b..52df4c73d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 2323fc8513c9f5e60683cf4aa90475b44a550170 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 - + https://github.com/dotnet/aspnetcore - e646901bfd855cb0a25ce0554aa4a42c39b14f4f + 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 + e025c3750e2a3ea66fd6854d45614582a97d22dd - + https://github.com/dotnet/sdk - 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 + e025c3750e2a3ea66fd6854d45614582a97d22dd - + https://github.com/dotnet/sdk - 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 + e025c3750e2a3ea66fd6854d45614582a97d22dd - + https://github.com/dotnet/sdk - 02fb92bac5b3ae10bb375844d84a80f5f8ee4681 + e025c3750e2a3ea66fd6854d45614582a97d22dd diff --git a/eng/Versions.props b/eng/Versions.props index 6f65932a2..ef860bf11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23180.5 - 8.0.0-preview.4.23180.5 - 8.0.0-preview.4.23180.5 - 8.0.0-preview.4.23180.5 - 8.0.0-preview.4.23180.5 - 8.0.0-preview.4.23180.5 - 8.0.0-preview.4.23180.5 + 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23181.1 0.2.0 - 8.0.100-preview.4.23181.3 - 8.0.100-preview.4.23181.3 - 8.0.100-preview.4.23181.3 + 8.0.100-preview.4.23181.5 + 8.0.100-preview.4.23181.5 + 8.0.100-preview.4.23181.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ff31e8228f397111a3a5fc2538817fa4827c3a5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 31 Mar 2023 16:14:39 +0000 Subject: [PATCH 750/864] Fix source-build issue related to stable versioning --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df816c265..594ca2a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,6 +152,10 @@ https://github.com/dotnet/msbuild 61dd6568446aff7602d37e6a15595371fa057012 + + + https://github.com/dotnet/msbuild + 61dd6568446aff7602d37e6a15595371fa057012 From 4ea0b33dc18dd48d0df2c786b7e22174b837cf79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 17:08:14 +0000 Subject: [PATCH 751/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23181.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52df4c73d..e8fecd22d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - e025c3750e2a3ea66fd6854d45614582a97d22dd + f8d7d61a06b437cc32f6af96a4712d64df05be3a - + https://github.com/dotnet/sdk - e025c3750e2a3ea66fd6854d45614582a97d22dd + f8d7d61a06b437cc32f6af96a4712d64df05be3a - + https://github.com/dotnet/sdk - e025c3750e2a3ea66fd6854d45614582a97d22dd + f8d7d61a06b437cc32f6af96a4712d64df05be3a - + https://github.com/dotnet/sdk - e025c3750e2a3ea66fd6854d45614582a97d22dd + f8d7d61a06b437cc32f6af96a4712d64df05be3a @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 2323fc8513c9f5e60683cf4aa90475b44a550170 + 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ef860bf11..21f9ee9a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23181.5 - 8.0.100-preview.4.23181.5 - 8.0.100-preview.4.23181.5 + 8.0.100-preview.4.23181.6 + 8.0.100-preview.4.23181.6 + 8.0.100-preview.4.23181.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23180.13 - 8.0.0-preview.4.23180.13 - 8.0.0-preview.4.23180.13 - 8.0.0-preview.4.23180.13 - 8.0.0-preview.4.23180.13 - 8.0.0-preview.4.23180.13 + 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23181.2 2.1.0 From e24d82ef3b450dd19828bd95323346e41a11468f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:00:50 +0000 Subject: [PATCH 752/864] Update dependencies from https://github.com/dotnet/test-templates build 20230331.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23174.1 -> To Version 1.1.0-rc.23181.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65ab5519a..76f0df2eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d77fd40ac..304a10ed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 From ce55da54c1143231b7776970e0364fa64789cf99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:00:57 +0000 Subject: [PATCH 753/864] Update dependencies from https://github.com/dotnet/test-templates build 20230331.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23181.2 --- 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 3f19cb1f8..bbf895c1a 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 - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + e3515a47c8ee0bfef167848712af4ff05c532af5 diff --git a/eng/Versions.props b/eng/Versions.props index 14686b8c7..2dfd5bc0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 + 1.1.0-rc.23181.2 From 57733356964e5dc69700514f0bc322e81771b7fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:54:43 +0000 Subject: [PATCH 754/864] Update dependencies from https://github.com/dotnet/test-templates build 20230331.3 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23181.3 --- 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 bbf895c1a..754445cd7 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 - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 diff --git a/eng/Versions.props b/eng/Versions.props index 2dfd5bc0c..62c48b38f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 From ccd2ee25a37b14923046f852568775d5cb799aa1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 18:59:44 +0000 Subject: [PATCH 755/864] Update dependencies from https://github.com/dotnet/test-templates build 20230331.3 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23174.1 -> To Version 1.1.0-rc.23181.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76f0df2eb..aa97fb5eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/test-templates - e3515a47c8ee0bfef167848712af4ff05c532af5 + 71521455de1aec62a85e1c4e28c7286f5a941b53 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 304a10ed1..ea10440fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 - 1.1.0-rc.23181.2 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 + 1.1.0-rc.23181.3 From f2990369c14a5cee1bee9c13663f2be97c2a346b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 19:31:57 +0000 Subject: [PATCH 756/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23181.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 e8fecd22d..3b0628311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - f8d7d61a06b437cc32f6af96a4712d64df05be3a + 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c - + https://github.com/dotnet/sdk - f8d7d61a06b437cc32f6af96a4712d64df05be3a + 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c - + https://github.com/dotnet/sdk - f8d7d61a06b437cc32f6af96a4712d64df05be3a + 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c - + https://github.com/dotnet/sdk - f8d7d61a06b437cc32f6af96a4712d64df05be3a + 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c diff --git a/eng/Versions.props b/eng/Versions.props index 21f9ee9a1..69cbf3f95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23181.6 - 8.0.100-preview.4.23181.6 - 8.0.100-preview.4.23181.6 + 8.0.100-preview.4.23181.8 + 8.0.100-preview.4.23181.8 + 8.0.100-preview.4.23181.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e9b0aad323051dc3ed080d2e8d2c62c48e7c9f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 Mar 2023 19:35:21 +0000 Subject: [PATCH 757/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15965) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65ab5519a..4e0568db8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - bc5210a7b68c43bcf9d9687b9268a4665126c583 + f9dc7282be60127425b58b40972374cdec0348ed From d817f921eb7519fa93860ca9f9e79791a3c54264 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 20:32:25 +0000 Subject: [PATCH 758/864] Update dependencies from https://github.com/dotnet/sdk build 20230331.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23181.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 3b0628311..fc2f1726f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c + b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 - + https://github.com/dotnet/sdk - 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c + b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 - + https://github.com/dotnet/sdk - 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c + b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 - + https://github.com/dotnet/sdk - 5102ea3fb70c4b1f30acf77bec66be8fe7f7381c + b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 diff --git a/eng/Versions.props b/eng/Versions.props index 69cbf3f95..0cbcc23ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23181.8 - 8.0.100-preview.4.23181.8 - 8.0.100-preview.4.23181.8 + 8.0.100-preview.4.23181.9 + 8.0.100-preview.4.23181.9 + 8.0.100-preview.4.23181.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7a315238d6e04694a55cdfa10b892371592454d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 03:12:06 +0000 Subject: [PATCH 759/864] Update dependencies from https://github.com/dotnet/sdk build 20230402.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23202.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc2f1726f..c62b49387 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 - + https://github.com/dotnet/aspnetcore - 0706ea3e8ffeb9d618a2aa9170cc4f8dc472d716 + 0b10e1349063b1b5b39dd0435509abb52cc81d90 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 + 269bf2a2185b0a32d60aafdbc1e25090b978acf3 - + https://github.com/dotnet/sdk - b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 + 269bf2a2185b0a32d60aafdbc1e25090b978acf3 - + https://github.com/dotnet/sdk - b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 + 269bf2a2185b0a32d60aafdbc1e25090b978acf3 - + https://github.com/dotnet/sdk - b5fc2fd0c35b40c2bffc2ce8e0780a2398ae4305 + 269bf2a2185b0a32d60aafdbc1e25090b978acf3 diff --git a/eng/Versions.props b/eng/Versions.props index 0cbcc23ef..53de05ed5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23181.1 - 8.0.0-preview.4.23181.1 - 8.0.0-preview.4.23181.1 - 8.0.0-preview.4.23181.1 - 8.0.0-preview.4.23181.1 - 8.0.0-preview.4.23181.1 - 8.0.0-preview.4.23181.1 + 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23202.1 0.2.0 - 8.0.100-preview.4.23181.9 - 8.0.100-preview.4.23181.9 - 8.0.100-preview.4.23181.9 + 8.0.100-preview.4.23202.2 + 8.0.100-preview.4.23202.2 + 8.0.100-preview.4.23202.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cb8d41ffc51c9a924029257ea19716fe314dbec4 Mon Sep 17 00:00:00 2001 From: Andrii Siriak Date: Mon, 3 Apr 2023 16:24:03 +0300 Subject: [PATCH 760/864] Fix typo in src/SourceBuild/content/Directory.Build.props --- src/SourceBuild/content/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 52b3c75b9..cd4080e23 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -199,7 +199,7 @@ - + From ff421514eafd1aa247a6033e64c18fecfed84234 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 3 Apr 2023 09:59:19 -0500 Subject: [PATCH 761/864] Enable per-repo-PVP for diagnostics (#15968) --- src/SourceBuild/content/repo-projects/diagnostics.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/diagnostics.proj b/src/SourceBuild/content/repo-projects/diagnostics.proj index 98a136cb5..28145aad0 100644 --- a/src/SourceBuild/content/repo-projects/diagnostics.proj +++ b/src/SourceBuild/content/repo-projects/diagnostics.proj @@ -4,6 +4,7 @@ $(StandardSourceBuildArgs) $(ProjectDirectory)eng\common\build$(ShellExtension) $(BuildCommandArgs) + DependenciesOnly From 7260cf93e62f5aa6e3a52f69537a1290246ed260 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 16:06:10 +0000 Subject: [PATCH 762/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23181.4 -> To Version 7.0.300-preview.23203.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.5.0-beta.23180.1 -> To Version 12.5.0-beta.23201.1 (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 594ca2a79..ab3b0f1a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 - + https://github.com/dotnet/sdk - 6952b7a478462c898db283979964d21bb3607566 + fcf5a8c6527ecf533225d36f38630eca63511bd1 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 576a650f5edc52f2ff294ea68a11e64fe8075e21 - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 576a650f5edc52f2ff294ea68a11e64fe8075e21 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 99e956e42697a6dd886d1e12478ea2b27cceacfa + 78abd4a4a0e5f9fcf55c6ee920d6265f74ff5b5a diff --git a/eng/Versions.props b/eng/Versions.props index 8128e226b..4dcb718bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23181.4 - 7.0.300-preview.23181.4 - 7.0.300-preview.23181.4 + 7.0.300-preview.23203.1 + 7.0.300-preview.23203.1 + 7.0.300-preview.23203.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de4d0cbfd60ade4157b249383b11b675c8865e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 3 Apr 2023 18:55:55 +0200 Subject: [PATCH 763/864] Make the VMR build work outside of git repository (#15963) --- eng/pipelines/templates/jobs/vmr-build.yml | 14 ++- .../content/.devcontainer/synchronize-vmr.sh | 0 src/SourceBuild/content/build.sh | 5 + src/SourceBuild/content/eng/pack-sources.sh | 96 ------------------- src/SourceBuild/content/prep.sh | 88 +++++++++++------ src/VirtualMonoRepo/README.template.md | 7 +- 6 files changed, 76 insertions(+), 134 deletions(-) mode change 100644 => 100755 src/SourceBuild/content/.devcontainer/synchronize-vmr.sh delete mode 100755 src/SourceBuild/content/eng/pack-sources.sh diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 77be79eb2..fcfc792a3 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -106,9 +106,8 @@ jobs: - ${{ if parameters.buildFromArchive }}: - script: | set -ex - "${{ parameters.vmrPath }}/eng/pack-sources.sh" -o "$(Build.StagingDirectory)/dotnet-sources.tar.gz" - tar -xf dotnet-sources.tar.gz - mv "dotnet-$(Build.SourceVersion)" "$(sourcesPath)" + cp -r "${{ parameters.vmrPath }}" "$(sourcesPath)" + rm -rf "$(sourcesPath)/.git" displayName: Export VMR sources workingDirectory: $(Build.StagingDirectory) @@ -182,7 +181,12 @@ jobs: echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet" fi - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh ${customPrepArgs} + if [[ '${{ parameters.buildFromArchive }}' == 'True' ]]; then + customPrepArgs="$customPrepArgs --source-repository https://github.com/dotnet/dotnet" + customPrepArgs="$customPrepArgs --source-version $(git -C "${{ parameters.vmrPath }}" rev-parse HEAD)" + fi + + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs displayName: Prep the Build - script: | @@ -207,7 +211,7 @@ jobs: customBuildArgs="$customBuildArgs --poison" fi - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${customRunArgs} ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) ${customBuildArgs} + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs displayName: Build - script: | diff --git a/src/SourceBuild/content/.devcontainer/synchronize-vmr.sh b/src/SourceBuild/content/.devcontainer/synchronize-vmr.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index 6fdf14c10..f797bab62 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -113,6 +113,11 @@ if [ -f "${packagesArchiveDir}archiveArtifacts.txt" ]; then fi fi +if [ ! -d "$SCRIPT_ROOT/.git" ]; then + echo "ERROR: $SCRIPT_ROOT is not a git repository. Please run prep.sh add initialize Source Link metadata." + exit 1 +fi + if [ -d "$CUSTOM_SDK_DIR" ]; then export SDK_VERSION=$("$CUSTOM_SDK_DIR/dotnet" --version) export CLI_ROOT="$CUSTOM_SDK_DIR" diff --git a/src/SourceBuild/content/eng/pack-sources.sh b/src/SourceBuild/content/eng/pack-sources.sh deleted file mode 100755 index ecb2c8920..000000000 --- a/src/SourceBuild/content/eng/pack-sources.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env bash - -### This script exports the sources of VMR (dotnet/dotnet) as an archive that can be used -### to build the .NET SDK. -### It expects you clone the dotnet/dotnet repo locally and check out the desired revision. -### -### USAGE: -### ./pack-sources.sh -o dotnet.tar.gz -### Options: -### -o, --output PATH -### Optional. Path or dir where the archive is created. -### Defaults to artifacts/packages/dotnet-[SHA].tar.gz - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -function print_help () { - sed -n '/^### /,/^$/p' "$source" | cut -b 5- -} - -GIT_ROOT=$(realpath "$scriptroot/../") - -output='' - -while [[ $# -gt 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -o|--output) - output=$2 - shift - ;; - -h|--help) - print_help - exit 0 - ;; - *) - fail "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -revision=$(git -C "$GIT_ROOT" rev-parse HEAD) -filename="dotnet-$revision" - -if [[ -z "$output" ]]; then - output="$GIT_ROOT/artifacts/packages/$filename.tar.gz" -fi - -# If output is directory, use the default filename -if [[ -d "$output" ]]; then - output="$output/$filename.tar.gz" -fi - -set -e - -echo "Packing sources of $revision to $output.." -mkdir -p "$(dirname "$output")" -rm -f "$output" - -tmp="$GIT_ROOT/artifacts/tmp" -mkdir -p "$tmp" -config_file="$tmp/config" -HEAD_file="$tmp/HEAD" - -start_time=$(date +%s) - -# We need to had `.git/HEAD` and `.git/config` to the archive as the build expects those -echo $'[remote "origin"]\nurl="http://github.com/dotnet/dotnet"' > "$config_file" -echo "$revision" > "$HEAD_file" - -git -C "$GIT_ROOT" archive \ - -o "$output" \ - --prefix "$filename/.git/" \ - --add-file "$config_file" \ - --add-file "$HEAD_file" \ - --prefix "$filename/" \ - "$revision" "$GIT_ROOT" - -end_time=$(date +%s) -elapsed=$(( end_time - start_time )) - -duration=$(date -u +%H:%M:%S "-d@$elapsed") -echo "Archive created in $duration" diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index bbe545d0d..df8f88cc0 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -10,10 +10,12 @@ usage() { echo " Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and" echo " installing the version of dotnet referenced in global.json" echo "options:" - echo " --no-artifacts Exclude the download of the previously source-built artifacts archive." + echo " --no-artifacts Exclude the download of the previously source-built artifacts archive" echo " --no-bootstrap Don't replace portable packages in the download source-built artifacts" - echo " --no-prebuilts Exclude the download of the prebuilts archive." - echo " --no-sdk Exclude the download of the .NET SDK." + echo " --no-prebuilts Exclude the download of the prebuilts archive" + echo " --no-sdk Exclude the download of the .NET SDK" + echo " --source-repository Source Link repository URL, required when building from tarball" + echo " --source-version Source Link revision, required when building from tarball" echo " --runtime-source-feed URL of a remote server or a local directory, from which SDKs and" echo " runtimes can be downloaded" echo " --runtime-source-feed-key Key for accessing the above server, if necessary" @@ -24,8 +26,10 @@ buildBootstrap=true downloadArtifacts=true downloadPrebuilts=true installDotnet=true -runtime_source_feed='' -runtime_source_feed_key='' +sourceUrl='' +sourceVersion='' +runtime_source_feed='' # IBM requested these to support s390x scenarios +runtime_source_feed_key='' # IBM requested these to support s390x scenarios positional_args=() while :; do if [ $# -le 0 ]; then @@ -49,6 +53,14 @@ while :; do --no-sdk) installDotnet=false ;; + --source-repository) + sourceUrl="$2" + shift + ;; + --source-version) + sourceVersion="$2" + shift + ;; --runtime-source-feed) runtime_source_feed=$2 shift @@ -67,57 +79,75 @@ done # Attempting to bootstrap without an SDK will fail. So either the --no-sdk flag must be passed # or a pre-existing .dotnet SDK directory must exist. -if [[ "$buildBootstrap" == "true" && "$installDotnet" == "false" && ! -d $SCRIPT_ROOT/.dotnet ]]; then +if [ "$buildBootstrap" == true ] && [ "$installDotnet" == false ] && [ ! -d "$SCRIPT_ROOT/.dotnet" ]; then echo " ERROR: --no-sdk requires --no-bootstrap or a pre-existing .dotnet SDK directory. Exiting..." - exit -1 + exit 1 fi # Check to make sure curl exists to download the archive files if ! command -v curl &> /dev/null then echo " ERROR: curl not found. Exiting..." - exit -1 + exit 1 +fi + +GIT_DIR="$SCRIPT_ROOT/.git" +if [ -f "$GIT_DIR/index" ]; then # We check for index because if outside of git, we create config and HEAD manually + if [ -n "$sourceUrl" ] || [ -n "$sourceVersion" ]; then + echo "ERROR: $SCRIPT_ROOT is a git repository, --source-repository and --source-version cannot be used." + exit 1 + fi +else + if [ -z "$sourceUrl" ] || [ -z "$sourceVersion" ]; then + echo "ERROR: $SCRIPT_ROOT is not a git repository, --source-repository and --source-version must be specified." + exit 1 + fi + + # We need to add "fake" .git/ files when not building from a git repository + mkdir -p "$GIT_DIR" + echo '[remote "origin"]' > "$GIT_DIR/config" + echo "url=\"$sourceUrl\"" >> "$GIT_DIR/config" + echo "$sourceVersion" > "$GIT_DIR/HEAD" fi # Check if Private.SourceBuilt artifacts archive exists artifactsBaseFileName="Private.SourceBuilt.Artifacts" packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/" -if [ "$downloadArtifacts" == "true" ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then +if [ "$downloadArtifacts" == true ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" downloadArtifacts=false fi # Check if Private.SourceBuilt prebuilts archive exists prebuiltsBaseFileName="Private.SourceBuilt.Prebuilts" -if [ "$downloadPrebuilts" == "true" ] && [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then +if [ "$downloadPrebuilts" == true ] && [ -f ${packagesArchiveDir}${prebuiltsBaseFileName}.*.tar.gz ]; then echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded" downloadPrebuilts=false fi # Check if dotnet is installed -if [[ "$installDotnet" == "true" && -d $SCRIPT_ROOT/.dotnet ]]; then +if [ "$installDotnet" == true ] && [ -d "$SCRIPT_ROOT/.dotnet" ]; then echo " ./.dotnet SDK directory exists...it will not be installed" installDotnet=false; fi function DownloadArchive { archiveType="$1" - baseFileName="$2" - isRequired="$3" + isRequired="$2" packageVersionsPath="$SCRIPT_ROOT/eng/Versions.props" notFoundMessage="No source-built $archiveType found to download..." echo " Looking for source-built $archiveType to download..." - archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + archiveVersionLine=$(grep -m 1 "" "$packageVersionsPath" || :) versionPattern="(.*)" if [[ $archiveVersionLine =~ $versionPattern ]]; then archiveUrl="${BASH_REMATCH[1]}" echo " Downloading source-built $archiveType from $archiveUrl..." - (cd $packagesArchiveDir && curl --retry 5 -O $archiveUrl) - elif [ "$isRequired" == "true" ]; then + (cd "$packagesArchiveDir" && curl --retry 5 -O "$archiveUrl") + elif [ "$isRequired" == true ]; then echo " ERROR: $notFoundMessage" - exit -1 + exit 1 else echo " $notFoundMessage" fi @@ -131,39 +161,39 @@ function BootstrapArtifacts { echo " Building bootstrap previously source-built in $workingDir" # Copy bootstrap project to working dir - cp $SCRIPT_ROOT/eng/bootstrap/buildBootstrapPreviouslySB.csproj $workingDir + cp "$SCRIPT_ROOT/eng/bootstrap/buildBootstrapPreviouslySB.csproj" "$workingDir" # Copy NuGet.config from the installer repo to have the right feeds - cp $SCRIPT_ROOT/src/installer/NuGet.config $workingDir + cp "$SCRIPT_ROOT/src/installer/NuGet.config" "$workingDir" # Get PackageVersions.props from existing prev-sb archive echo " Retrieving PackageVersions.props from existing archive" - sourceBuiltArchive=`find $packagesArchiveDir -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` + sourceBuiltArchive=$(find "$packagesArchiveDir" -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz') if [ -f "$sourceBuiltArchive" ]; then - tar -xzf "$sourceBuiltArchive" -C $workingDir PackageVersions.props + tar -xzf "$sourceBuiltArchive" -C "$workingDir" PackageVersions.props fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$packagesArchiveDir" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" + "$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$packagesArchiveDir" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" # Remove working directory - rm -rf $workingDir + rm -rf "$workingDir" } # Check for the version of dotnet to install -if [ "$installDotnet" == "true" ]; then +if [ "$installDotnet" == true ]; then echo " Installing dotnet..." (source ./eng/common/tools.sh && InitializeDotNetCli true) fi # Read the eng/Versions.props to get the archives to download and download them -if [ "$downloadArtifacts" == "true" ]; then - DownloadArchive "Artifacts" $artifactsBaseFileName "true" - if [ "$buildBootstrap" == "true" ]; then +if [ "$downloadArtifacts" == true ]; then + DownloadArchive Artifacts true + if [ "$buildBootstrap" == true ]; then BootstrapArtifacts fi fi -if [ "$downloadPrebuilts" == "true" ]; then - DownloadArchive "Prebuilts" $prebuiltsBaseFileName "false" +if [ "$downloadPrebuilts" == true ]; then + DownloadArchive Prebuilts false fi diff --git a/src/VirtualMonoRepo/README.template.md b/src/VirtualMonoRepo/README.template.md index f6d91d55f..5c8bdd06e 100644 --- a/src/VirtualMonoRepo/README.template.md +++ b/src/VirtualMonoRepo/README.template.md @@ -139,11 +139,10 @@ ln -s $HOME/.dotnet/dotnet /usr/bin/dotnet You can also utilize [GitHub Codespaces](https://github.com/features/codespaces) where you can find preset containers in this repository. -### Exporting a source archive +### Building outside of git -In case you'd like to export a more lightweight archive of sources that can be built outside of this git repository, a simple copy of the working tree won't do. -The build is using some git metadata (information from the `.git` directory) that are needed to be kept with the sources. -To export a `tar.gz` archive of the sources, you need to use the `eng/pack-sources.sh` script from within a clone of the VMR checked out at the revision that you're interested in. +.NET uses git metadata so that it can link assemblies to their original source code when debugging (think "Step into.." functionality) and for that it needs information about the original place the code comes from. +When you're building source code only, taken outside of context of a git repository (e.g. you download it from the release page), you will need to specify the source repository to the `prep.sh` script via the `--source-repository` and `--source-version` arguments. This can be your fork of the repository and should match the origin where your SDK was built from. ## List of components From 26210126e9121c7c992ac3e700cdf47ba54fd834 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 17:43:52 +0000 Subject: [PATCH 764/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23203.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d9907171..b53aacdeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 - + https://github.com/dotnet/aspnetcore - 0b10e1349063b1b5b39dd0435509abb52cc81d90 + 258d79cd89c8abffdc87f87f356e9afd127ff564 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/sdk - 269bf2a2185b0a32d60aafdbc1e25090b978acf3 + 7460d6efa983095ca2c2803bcac55699e498d116 - + https://github.com/dotnet/sdk - 269bf2a2185b0a32d60aafdbc1e25090b978acf3 + 7460d6efa983095ca2c2803bcac55699e498d116 - + https://github.com/dotnet/sdk - 269bf2a2185b0a32d60aafdbc1e25090b978acf3 + 7460d6efa983095ca2c2803bcac55699e498d116 - + https://github.com/dotnet/sdk - 269bf2a2185b0a32d60aafdbc1e25090b978acf3 + 7460d6efa983095ca2c2803bcac55699e498d116 diff --git a/eng/Versions.props b/eng/Versions.props index 442756f5a..9a4b6da01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23202.1 - 8.0.0-preview.4.23202.1 - 8.0.0-preview.4.23202.1 - 8.0.0-preview.4.23202.1 - 8.0.0-preview.4.23202.1 - 8.0.0-preview.4.23202.1 - 8.0.0-preview.4.23202.1 + 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.6 0.2.0 - 8.0.100-preview.4.23202.2 - 8.0.100-preview.4.23202.2 - 8.0.100-preview.4.23202.2 + 8.0.100-preview.4.23203.2 + 8.0.100-preview.4.23203.2 + 8.0.100-preview.4.23203.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ce32b7b5e76ef79dd9b50e6d90a263d3281bed5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 18:59:37 +0000 Subject: [PATCH 765/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23203.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 b53aacdeb..47ef85bca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/sdk - 7460d6efa983095ca2c2803bcac55699e498d116 + 733eec58c350f139bbedbdccb38df128ca60b8c3 - + https://github.com/dotnet/sdk - 7460d6efa983095ca2c2803bcac55699e498d116 + 733eec58c350f139bbedbdccb38df128ca60b8c3 - + https://github.com/dotnet/sdk - 7460d6efa983095ca2c2803bcac55699e498d116 + 733eec58c350f139bbedbdccb38df128ca60b8c3 - + https://github.com/dotnet/sdk - 7460d6efa983095ca2c2803bcac55699e498d116 + 733eec58c350f139bbedbdccb38df128ca60b8c3 diff --git a/eng/Versions.props b/eng/Versions.props index 9a4b6da01..6d807c892 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23203.2 - 8.0.100-preview.4.23203.2 - 8.0.100-preview.4.23203.2 + 8.0.100-preview.4.23203.3 + 8.0.100-preview.4.23203.3 + 8.0.100-preview.4.23203.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6aa3551dd05b6626d88c8c96be71b7b0041be397 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 20:46:37 +0000 Subject: [PATCH 766/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23203.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47ef85bca..da4b71ee1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 - + https://github.com/dotnet/aspnetcore - 258d79cd89c8abffdc87f87f356e9afd127ff564 + 64be3b197fe3c65f5eb56119f1b12814910753a4 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/sdk - 733eec58c350f139bbedbdccb38df128ca60b8c3 + 1bfea5a004da688fceb4477c44b5345cf256d9c4 - + https://github.com/dotnet/sdk - 733eec58c350f139bbedbdccb38df128ca60b8c3 + 1bfea5a004da688fceb4477c44b5345cf256d9c4 - + https://github.com/dotnet/sdk - 733eec58c350f139bbedbdccb38df128ca60b8c3 + 1bfea5a004da688fceb4477c44b5345cf256d9c4 - + https://github.com/dotnet/sdk - 733eec58c350f139bbedbdccb38df128ca60b8c3 + 1bfea5a004da688fceb4477c44b5345cf256d9c4 diff --git a/eng/Versions.props b/eng/Versions.props index 6d807c892..be82d715f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23203.6 - 8.0.0-preview.4.23203.6 - 8.0.0-preview.4.23203.6 - 8.0.0-preview.4.23203.6 - 8.0.0-preview.4.23203.6 - 8.0.0-preview.4.23203.6 - 8.0.0-preview.4.23203.6 + 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.7 0.2.0 - 8.0.100-preview.4.23203.3 - 8.0.100-preview.4.23203.3 - 8.0.100-preview.4.23203.3 + 8.0.100-preview.4.23203.6 + 8.0.100-preview.4.23203.6 + 8.0.100-preview.4.23203.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6fc960bb45c940116833317f425b3ae9e4cd3596 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 21:48:10 +0000 Subject: [PATCH 767/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23203.1 -> To Version 7.0.300-preview.23203.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23201.1 -> To Version 12.5.0-beta.23203.7 (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 ab3b0f1a4..686c5a3dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - fcf5a8c6527ecf533225d36f38630eca63511bd1 + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 576a650f5edc52f2ff294ea68a11e64fe8075e21 + 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/dotnet/fsharp - 576a650f5edc52f2ff294ea68a11e64fe8075e21 + 5b37dd5fea143baefbef2bd83836188af0815a30 diff --git a/eng/Versions.props b/eng/Versions.props index 4dcb718bc..de1a0e16c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23203.1 - 7.0.300-preview.23203.1 - 7.0.300-preview.23203.1 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37adcc4f668b2451d9196b3b930750ef731f81a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 21:56:27 +0000 Subject: [PATCH 768/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23203.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 da4b71ee1..274264496 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/sdk - 1bfea5a004da688fceb4477c44b5345cf256d9c4 + 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de - + https://github.com/dotnet/sdk - 1bfea5a004da688fceb4477c44b5345cf256d9c4 + 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de - + https://github.com/dotnet/sdk - 1bfea5a004da688fceb4477c44b5345cf256d9c4 + 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de - + https://github.com/dotnet/sdk - 1bfea5a004da688fceb4477c44b5345cf256d9c4 + 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de diff --git a/eng/Versions.props b/eng/Versions.props index be82d715f..003860fb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23203.6 - 8.0.100-preview.4.23203.6 - 8.0.100-preview.4.23203.6 + 8.0.100-preview.4.23203.8 + 8.0.100-preview.4.23203.8 + 8.0.100-preview.4.23203.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a06b46c1d7b582b7410601657cbdc75d12759413 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Apr 2023 23:51:12 +0000 Subject: [PATCH 769/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23178.2 -> To Version 8.0.100-preview.4.23203.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23177.1 -> To Version 8.0.0-preview.4.23178.3 (parent: Microsoft.NET.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 274264496..b37460b46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/sdk - 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de + 6d8ec413a309c7e39e1eec912a7a8621484a88b8 - + https://github.com/dotnet/sdk - 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de + 6d8ec413a309c7e39e1eec912a7a8621484a88b8 - + https://github.com/dotnet/sdk - 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de + 6d8ec413a309c7e39e1eec912a7a8621484a88b8 - + https://github.com/dotnet/sdk - 92cfbb28ce5503f4dd43c41ea849ba3899d9a9de + 6d8ec413a309c7e39e1eec912a7a8621484a88b8 diff --git a/eng/Versions.props b/eng/Versions.props index 003860fb4..e4f3d87c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23203.8 - 8.0.100-preview.4.23203.8 - 8.0.100-preview.4.23203.8 + 8.0.100-preview.4.23203.9 + 8.0.100-preview.4.23203.9 + 8.0.100-preview.4.23203.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 513812fc54796dae700cbb5f0da3eaf33c0f3c21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Apr 2023 05:37:15 +0000 Subject: [PATCH 770/864] Update dependencies from https://github.com/dotnet/sdk build 20230403.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23203.9 -> To Version 8.0.100-preview.4.23203.10 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.4.23203.7 -> To Version 8.0.0-preview.4.23203.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b37460b46..c70e98faf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea - + https://github.com/dotnet/aspnetcore - 64be3b197fe3c65f5eb56119f1b12814910753a4 + cb71b0015bca4c3f50bb58ffe7fc48075faa9bea https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 71521455de1aec62a85e1c4e28c7286f5a941b53 - + https://github.com/dotnet/sdk - 6d8ec413a309c7e39e1eec912a7a8621484a88b8 + 326fa05c36c21a75fec88a28faa555371c9af8c2 - + https://github.com/dotnet/sdk - 6d8ec413a309c7e39e1eec912a7a8621484a88b8 + 326fa05c36c21a75fec88a28faa555371c9af8c2 - + https://github.com/dotnet/sdk - 6d8ec413a309c7e39e1eec912a7a8621484a88b8 + 326fa05c36c21a75fec88a28faa555371c9af8c2 - + https://github.com/dotnet/sdk - 6d8ec413a309c7e39e1eec912a7a8621484a88b8 + 326fa05c36c21a75fec88a28faa555371c9af8c2 diff --git a/eng/Versions.props b/eng/Versions.props index e4f3d87c3..e6981c92c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23203.7 - 8.0.0-preview.4.23203.7 - 8.0.0-preview.4.23203.7 - 8.0.0-preview.4.23203.7 - 8.0.0-preview.4.23203.7 - 8.0.0-preview.4.23203.7 - 8.0.0-preview.4.23203.7 + 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23203.12 0.2.0 - 8.0.100-preview.4.23203.9 - 8.0.100-preview.4.23203.9 - 8.0.100-preview.4.23203.9 + 8.0.100-preview.4.23203.10 + 8.0.100-preview.4.23203.10 + 8.0.100-preview.4.23203.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 138c3bbdf4c91b75a57e623bdeba4df7782bc435 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Apr 2023 10:33:55 -0700 Subject: [PATCH 771/864] Update branding to 7.0.204 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 355237ca9..0361d3816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 157f63c3242703cec4e7de0810d97248e36de129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Apr 2023 19:00:51 +0000 Subject: [PATCH 772/864] Update dependencies from https://github.com/dotnet/test-templates build 20230404.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23166.1 -> To Version 1.1.0-rc.23204.1 --- 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 754445cd7..12d976155 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 - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 diff --git a/eng/Versions.props b/eng/Versions.props index 62c48b38f..f872b0e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 From 77284eebbbf11f405c17f9ba01214f1ea0b63b18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Apr 2023 20:06:15 +0000 Subject: [PATCH 773/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230404.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23181.3 -> To Version 8.0.0-alpha.1.23204.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c70e98faf..b7b5d0fb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - f9dc7282be60127425b58b40972374cdec0348ed + fe3a8c9174ef41ad8cab4bb4cd5c153ccd030b20 From 989340c18f2ed97827d61221e344ce2ab68cff43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 20:11:43 +0000 Subject: [PATCH 774/864] [main] Update dependencies from dotnet/test-templates (#15984) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c70e98faf..94dd595a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - 71521455de1aec62a85e1c4e28c7286f5a941b53 + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e6981c92c..6205e3c50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 - 1.1.0-rc.23181.3 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 From 6a58883a80c05bbbc343fb648983988530b70ec8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 20:11:55 +0000 Subject: [PATCH 775/864] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15985) [release/7.0.3xx] Update dependencies from dotnet/test-templates --- 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 686c5a3dc..b2a4a7132 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 - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/test-templates - eb937b61acd09d5698e9c16d80e2ad49f4eeaada + 5a41781eb69eb4721e736a99262dbd32b6bb55d4 diff --git a/eng/Versions.props b/eng/Versions.props index de1a0e16c..93f323b4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 - 1.1.0-rc.23174.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 + 1.1.0-rc.23204.1 From b2494da48bcb7a53fa7d1a2bca8940004849590a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 Apr 2023 15:51:27 -0700 Subject: [PATCH 776/864] 7.0.4xx branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93f323b4c..324ebcd81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 7 0 - 3 + 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview From 600509a4935d94e93ad724521ebd28609deafdd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 23:03:40 +0000 Subject: [PATCH 777/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15990) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23cb45dc9..509926f39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - fe3a8c9174ef41ad8cab4bb4cd5c153ccd030b20 + 2d28a5e97867316939ef8108f219a8de073d0f03 From f219a8a983402deb48dc37aa869b550592cb30e2 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 5 Apr 2023 09:51:46 -0500 Subject: [PATCH 778/864] Prevent prebuilt tarball reuse in SB bootstrap leg (#15964) --- eng/pipelines/templates/jobs/vmr-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index fcfc792a3..77b477c25 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -126,7 +126,9 @@ jobs: - ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: - download: current artifact: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts - patterns: '*.tar.gz' + patterns: | + **/Private.SourceBuilt.Artifacts.*.tar.gz + **/dotnet-sdk-*.tar.gz displayName: Download Previous Build - task: CopyFiles@2 From b9b37c350a4fd5947a18d21ce923d9c68dfbc8fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 15:49:56 +0000 Subject: [PATCH 779/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15993) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 509926f39..61b5766dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 2d28a5e97867316939ef8108f219a8de073d0f03 + 171592ccc4d377c3671713b4d331598b0fade255 From 9908caac46c812f46d5c837ad7d970a22d340153 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 17:23:19 +0000 Subject: [PATCH 780/864] [main] Update dependencies from dotnet/source-build-reference-packages (#15994) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b5766dd..b879a3996 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 171592ccc4d377c3671713b4d331598b0fade255 + 28641163705be02412e9077688729d214d414921 From 7c538db513df0e6f4be018fcee12288b531abb92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Apr 2023 19:20:22 +0000 Subject: [PATCH 781/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230405.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23205.2 -> To Version 8.0.0-alpha.1.23205.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b879a3996..262c7076c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 28641163705be02412e9077688729d214d414921 + 4c8116234396868408f74840cf61b1d042ebdf64 From ac39002d203c7b3db52c5ddb10ce19cf1e34febb Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 5 Apr 2023 14:22:24 -0500 Subject: [PATCH 782/864] Enable PVP flow for emsdk (#15995) --- src/SourceBuild/content/repo-projects/emsdk.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/emsdk.proj b/src/SourceBuild/content/repo-projects/emsdk.proj index 4f88c9ff4..517720efc 100644 --- a/src/SourceBuild/content/repo-projects/emsdk.proj +++ b/src/SourceBuild/content/repo-projects/emsdk.proj @@ -17,6 +17,8 @@ $(BuildCommandArgs) /p:PlatformName=$(TargetArch) $(BuildCommandArgs) /p:ForceBuildManifestOnly=true $(StandardSourceBuildCommand) $(BuildCommandArgs) + + DependenciesOnly From 65cbf8a3e50229c2925f71de3d9579f6081c9d4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Apr 2023 20:23:45 +0000 Subject: [PATCH 783/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230405.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23205.2 -> To Version 8.0.0-alpha.1.23205.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 262c7076c..fe5786e1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 4c8116234396868408f74840cf61b1d042ebdf64 + e8e078814141a602d26888f4b81a2d29778be9da From b3367914b9605208b6f663e4d41c2cf89e8e5279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 20:28:49 +0000 Subject: [PATCH 784/864] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15992) [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 b2a4a7132..768037280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d - + https://github.com/dotnet/sdk - bc516e3febc26661c9c35e756abe8d3ebb1f11e5 + f926985763ae5c226cf59cd0cac8a09f38ce300d diff --git a/eng/Versions.props b/eng/Versions.props index 93f323b4c..15f39434d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 - 7.0.300-preview.23203.7 + 7.0.300-preview.23204.25 + 7.0.300-preview.23204.25 + 7.0.300-preview.23204.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 75d267ba229014d39d70084d7b521fa2a67b3c41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Apr 2023 21:00:36 +0000 Subject: [PATCH 785/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230405.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23205.2 -> To Version 8.0.0-alpha.1.23205.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe5786e1b..5a7ceaa47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - e8e078814141a602d26888f4b81a2d29778be9da + 09c4d8e93c5b78897bccb4f27e0c373647fb3985 From c1ade016a74aba011785514d06965a3eec17a3ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 03:41:17 +0000 Subject: [PATCH 786/864] Update dependencies from https://github.com/dotnet/sdk build 20230405.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23203.10 -> To Version 8.0.100-preview.4.23205.11 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23174-01 -> To Version 17.7.0-preview-23204-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 5a7ceaa47..b95664fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 326fa05c36c21a75fec88a28faa555371c9af8c2 + 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 - + https://github.com/dotnet/sdk - 326fa05c36c21a75fec88a28faa555371c9af8c2 + 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 - + https://github.com/dotnet/sdk - 326fa05c36c21a75fec88a28faa555371c9af8c2 + 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 - + https://github.com/dotnet/sdk - 326fa05c36c21a75fec88a28faa555371c9af8c2 + 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 @@ -151,9 +151,9 @@ 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 - + https://github.com/dotnet/msbuild - e7de1330724224a542668e1ef82c997613c7080c + 413571dea9ebb0023f26e5c0f5cd514d30b61465 diff --git a/eng/Versions.props b/eng/Versions.props index 6205e3c50..92dd08d92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23203.10 - 8.0.100-preview.4.23203.10 - 8.0.100-preview.4.23203.10 + 8.0.100-preview.4.23205.11 + 8.0.100-preview.4.23205.11 + 8.0.100-preview.4.23205.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 90645c137681df2037c58b730b70db67fa0b73a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 04:55:22 +0000 Subject: [PATCH 787/864] Update dependencies from https://github.com/dotnet/sdk build 20230405.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23203.10 -> To Version 8.0.100-preview.4.23205.13 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23174-01 -> To Version 17.7.0-preview-23204-03 (parent: Microsoft.NET.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 b95664fd2..fa793ab00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 + 411fa3d734a6e980c016fc7450cb39f5914a56c9 - + https://github.com/dotnet/sdk - 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 + 411fa3d734a6e980c016fc7450cb39f5914a56c9 - + https://github.com/dotnet/sdk - 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 + 411fa3d734a6e980c016fc7450cb39f5914a56c9 - + https://github.com/dotnet/sdk - 48f77fa3e7244bfd1f6219767a62267ba24fc5f4 + 411fa3d734a6e980c016fc7450cb39f5914a56c9 diff --git a/eng/Versions.props b/eng/Versions.props index 92dd08d92..bfd8f6cc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23205.11 - 8.0.100-preview.4.23205.11 - 8.0.100-preview.4.23205.11 + 8.0.100-preview.4.23205.13 + 8.0.100-preview.4.23205.13 + 8.0.100-preview.4.23205.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f2e58ab02ab71a71b2cdd9ca0487ab7ac99c5055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 05:54:05 +0000 Subject: [PATCH 788/864] Update dependencies from https://github.com/dotnet/sdk build 20230405.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23203.10 -> To Version 8.0.100-preview.4.23205.14 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build From Version 8.0.0-preview.4.23203.12 -> To Version 8.0.0-preview.4.23205.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa793ab00..f204c983b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 - + https://github.com/dotnet/aspnetcore - cb71b0015bca4c3f50bb58ffe7fc48075faa9bea + acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 411fa3d734a6e980c016fc7450cb39f5914a56c9 + 96f4e06b4d579146332607aa2fe83113e24efaa4 - + https://github.com/dotnet/sdk - 411fa3d734a6e980c016fc7450cb39f5914a56c9 + 96f4e06b4d579146332607aa2fe83113e24efaa4 - + https://github.com/dotnet/sdk - 411fa3d734a6e980c016fc7450cb39f5914a56c9 + 96f4e06b4d579146332607aa2fe83113e24efaa4 - + https://github.com/dotnet/sdk - 411fa3d734a6e980c016fc7450cb39f5914a56c9 + 96f4e06b4d579146332607aa2fe83113e24efaa4 diff --git a/eng/Versions.props b/eng/Versions.props index bfd8f6cc6..f51ea8e77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23203.12 - 8.0.0-preview.4.23203.12 - 8.0.0-preview.4.23203.12 - 8.0.0-preview.4.23203.12 - 8.0.0-preview.4.23203.12 - 8.0.0-preview.4.23203.12 - 8.0.0-preview.4.23203.12 + 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.3 0.2.0 - 8.0.100-preview.4.23205.13 - 8.0.100-preview.4.23205.13 - 8.0.100-preview.4.23205.13 + 8.0.100-preview.4.23205.14 + 8.0.100-preview.4.23205.14 + 8.0.100-preview.4.23205.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85f891bd25006b7419c940ba568f1f8d998bb7b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 09:00:17 +0000 Subject: [PATCH 789/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23205.14 -> To Version 8.0.100-preview.4.23206.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.4.23205.3 -> To Version 8.0.0-preview.4.23205.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f204c983b..5559415d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 - + https://github.com/dotnet/aspnetcore - acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1 + dce793fda55ebc9b32eb69ff01023a618ed06942 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 96f4e06b4d579146332607aa2fe83113e24efaa4 + 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 - + https://github.com/dotnet/sdk - 96f4e06b4d579146332607aa2fe83113e24efaa4 + 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 - + https://github.com/dotnet/sdk - 96f4e06b4d579146332607aa2fe83113e24efaa4 + 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 - + https://github.com/dotnet/sdk - 96f4e06b4d579146332607aa2fe83113e24efaa4 + 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 diff --git a/eng/Versions.props b/eng/Versions.props index f51ea8e77..7f3996717 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23205.3 - 8.0.0-preview.4.23205.3 - 8.0.0-preview.4.23205.3 - 8.0.0-preview.4.23205.3 - 8.0.0-preview.4.23205.3 - 8.0.0-preview.4.23205.3 - 8.0.0-preview.4.23205.3 + 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23205.4 0.2.0 - 8.0.100-preview.4.23205.14 - 8.0.100-preview.4.23205.14 - 8.0.100-preview.4.23205.14 + 8.0.100-preview.4.23206.2 + 8.0.100-preview.4.23206.2 + 8.0.100-preview.4.23206.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59240f82fe85f3692f99c415bbc19e4b15a4320c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 12:25:35 +0000 Subject: [PATCH 790/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23205.14 -> To Version 8.0.100-preview.4.23206.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-preview.4.23205.3 -> To Version 8.0.0-preview.4.23205.4 (parent: Microsoft.NET.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 5559415d4..7581d9082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 + 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 - + https://github.com/dotnet/sdk - 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 + 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 - + https://github.com/dotnet/sdk - 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 + 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 - + https://github.com/dotnet/sdk - 057d48e0129cf6e9bd6ca28c952799b9d60f5b41 + 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 diff --git a/eng/Versions.props b/eng/Versions.props index 7f3996717..d5998438a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.2 - 8.0.100-preview.4.23206.2 - 8.0.100-preview.4.23206.2 + 8.0.100-preview.4.23206.6 + 8.0.100-preview.4.23206.6 + 8.0.100-preview.4.23206.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa5b3cf4c259ac793d345baf8a863abb8c18d28f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 14:32:30 +0000 Subject: [PATCH 791/864] Update dependencies from https://github.com/dotnet/arcade build 20230405.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23177.4 -> To Version 8.0.0-beta.23205.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23175-02 -> To Version 1.2.0-beta-23202-01 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f204c983b..b1d0f5571 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b https://github.com/dotnet/arcade-services @@ -223,14 +223,14 @@ 09c4d8e93c5b78897bccb4f27e0c373647fb3985 - + https://github.com/dotnet/sourcelink - ccfca8dce5f7525433756281c2c275386348a9ad + 47edfd68f25fc5a9dd399b6e3f8f20a355f82e1a - + https://github.com/dotnet/xliff-tasks - f8afbbadc5b87ae70b8993f4a9cfa54fb820d6ce + a0d9b0e10c67721157c066abb9210d1e3e774014 diff --git a/eng/Versions.props b/eng/Versions.props index f51ea8e77..d72e2f6a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23177.4 + 8.0.0-beta.23205.4 diff --git a/global.json b/global.json index 93b4ed949..8e0ab15e1 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23205.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23205.4" } } From f198895c8b91e50cb5b67893455d30f7d2f599ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 15:20:14 +0000 Subject: [PATCH 792/864] Update dependencies from https://github.com/dotnet/source-build-externals build 20230403.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23178.2 -> To Version 8.0.0-alpha.1.23203.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f204c983b..efd56a731 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ b60c95e1ce736630d17e16626c59e3dd85ebae2b - + https://github.com/dotnet/source-build-externals - cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379 + 33edde07d61cf7606d76ada765335fb81f1cbb71 From b81a878ddd19d1c4e465873104dfe4e8d8a1e5e1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 6 Apr 2023 11:01:08 -0500 Subject: [PATCH 793/864] Enable PVP flow for xliff-tasks (#16000) --- src/SourceBuild/content/repo-projects/xliff-tasks.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/xliff-tasks.proj b/src/SourceBuild/content/repo-projects/xliff-tasks.proj index e6c43dd75..780ddf54b 100644 --- a/src/SourceBuild/content/repo-projects/xliff-tasks.proj +++ b/src/SourceBuild/content/repo-projects/xliff-tasks.proj @@ -7,6 +7,7 @@ true true + DependenciesOnly From 63966f4ab02602fa94ae12cb9eadfd9a7bf97c30 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 6 Apr 2023 11:31:58 -0500 Subject: [PATCH 794/864] Enable PVP flow for source-build-externals (#16002) --- .../content/repo-projects/source-build-externals.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj index 6f905da54..e4d376bd0 100644 --- a/src/SourceBuild/content/repo-projects/source-build-externals.proj +++ b/src/SourceBuild/content/repo-projects/source-build-externals.proj @@ -3,6 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + DependenciesOnly From caaa695c2ad945ef0c76c88f85cda98f71421c58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 16:45:06 +0000 Subject: [PATCH 795/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230406.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23205.5 -> To Version 8.0.0-alpha.1.23206.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f204c983b..b982901f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 09c4d8e93c5b78897bccb4f27e0c373647fb3985 + 6a91d289e6c4dea319d6f634389a87cec286c52c From 5b4b0548f0d7992900ba4d0b225e2368c172fc9c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 6 Apr 2023 12:46:14 -0500 Subject: [PATCH 796/864] Enable PVP flow for symreader (#16003) --- src/SourceBuild/content/repo-projects/symreader.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj index 6f905da54..e4d376bd0 100644 --- a/src/SourceBuild/content/repo-projects/symreader.proj +++ b/src/SourceBuild/content/repo-projects/symreader.proj @@ -3,6 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + DependenciesOnly From 9514db96a62db541d3ab1aafa768f31165a8e6ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 17:54:12 +0000 Subject: [PATCH 797/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.9 --- 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 7581d9082..66ebe610b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + b69288381d8050eae08224875658667665336593 diff --git a/eng/Versions.props b/eng/Versions.props index d5998438a..48897949a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.6 - 8.0.100-preview.4.23206.6 - 8.0.100-preview.4.23206.6 + 8.0.100-preview.4.23206.9 + 8.0.100-preview.4.23206.9 + 8.0.100-preview.4.23206.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a1a2ca5c5a0ea7ee07d7250bbe4d8e63d3c813c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 17:55:47 +0000 Subject: [PATCH 798/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.10 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230323-05 -> To Version 17.7.0-preview.23205.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66ebe610b..dd193531e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 - + https://github.com/dotnet/sdk - b69288381d8050eae08224875658667665336593 + b7fa1393f0a4271b2d3dc74e9c89b039b7351757 @@ -137,9 +137,9 @@ 15e94b3cb730ed90d454141e0d4c10a28d9efe1d - + https://github.com/microsoft/vstest - 2d656fe2133f89248825419fb8ffac5505486906 + 27666deccccf3fc8ed40f04d2fe80e36e6186181 diff --git a/eng/Versions.props b/eng/Versions.props index 48897949a..ef66efc8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.9 - 8.0.100-preview.4.23206.9 - 8.0.100-preview.4.23206.9 + 8.0.100-preview.4.23206.10 + 8.0.100-preview.4.23206.10 + 8.0.100-preview.4.23206.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -218,7 +218,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230323-05 + 17.7.0-preview.23205.10 8.0.0-alpha.1.22557.12 From 42fc8ea6c0e1691cb66b235a2e777e4d5421c4d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 18:40:33 +0000 Subject: [PATCH 799/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.11 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++-------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd193531e..c8765c351 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 5d65ee05af31b5a6a0e4faec09e7501b474a997a https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 - + https://github.com/dotnet/sdk - b7fa1393f0a4271b2d3dc74e9c89b039b7351757 + c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 599cce2fff315dd2c6d712436e890837cdc3ff3e - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 5b37dd5fea143baefbef2bd83836188af0815a30 @@ -142,18 +142,18 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 https://github.com/dotnet/roslyn 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 - + https://github.com/dotnet/msbuild - 413571dea9ebb0023f26e5c0f5cd514d30b61465 + 171676d8179a0032a2890c3d0ad6f9e245ca1f5c diff --git a/eng/Versions.props b/eng/Versions.props index ef66efc8d..a28b9c119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.4 0.2.0 - 8.0.100-preview.4.23206.10 - 8.0.100-preview.4.23206.10 - 8.0.100-preview.4.23206.10 + 8.0.100-preview.4.23206.11 + 8.0.100-preview.4.23206.11 + 8.0.100-preview.4.23206.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.2 2.1.0 From 30373420bd06efb3f12a7a44c3377ecb7762f3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Thu, 6 Apr 2023 21:08:03 +0200 Subject: [PATCH 800/864] Add KnownWebAssemblySdkPack to GenerateBundledVersions (#15951) --- src/redist/targets/GenerateBundledVersions.targets | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 4255356ef..2c52af8fb 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -405,6 +405,10 @@ Copyright (c) .NET Foundation. All rights reserved. + + Date: Thu, 6 Apr 2023 19:51:42 +0000 Subject: [PATCH 801/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.12 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6614e11a..383a57617 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 - + https://github.com/dotnet/sdk - c8e6c481e0fb32e2a5adb8768e066df4d95f9fa3 + 6843e580727326a2a832359efb1e53632c3c5094 @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 2c8cb129ed084e374f06eaa29f21e9ab0b9e8066 + 9998d5a6b2424310d578d6339c708c013a4e650f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a28b9c119..a6ca5f5c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.11 - 8.0.100-preview.4.23206.11 - 8.0.100-preview.4.23206.11 + 8.0.100-preview.4.23206.12 + 8.0.100-preview.4.23206.12 + 8.0.100-preview.4.23206.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 - 8.0.0-preview.4.23206.2 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.3 2.1.0 From b2a41f6ab0cbdb76c951f62ec3b6a86bb2b44d97 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 6 Apr 2023 15:04:32 -0500 Subject: [PATCH 802/864] Enable PVP flow for xdt (#16006) --- src/SourceBuild/content/repo-projects/xdt.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/xdt.proj b/src/SourceBuild/content/repo-projects/xdt.proj index 43d3336f2..32c97b194 100644 --- a/src/SourceBuild/content/repo-projects/xdt.proj +++ b/src/SourceBuild/content/repo-projects/xdt.proj @@ -7,6 +7,7 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) true + DependenciesOnly From 5dae3ba7233429e7caeffae0c1c5f0e37c1bef26 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 6 Apr 2023 21:01:10 +0000 Subject: [PATCH 803/864] Remove backported source-build runtime patch --- ...1-Fix-for-item-based-msbuild-pattern.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch diff --git a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch deleted file mode 100644 index f5e666d76..000000000 --- a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 1 Mar 2023 00:08:32 +0000 -Subject: [PATCH] Fix for item-based msbuild pattern - -Backport: https://github.com/dotnet/runtime/issues/82795 ---- - src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -index 251336540b5..72a3537a5ce 100644 ---- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -+++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -@@ -346,7 +346,13 @@ Copyright (c) .NET Foundation. All rights reserved. - _CreateR2RImages; - _CreateR2RSymbols"> - -- -+ -+ <_R2RCrossgenTelemetry Include="PublishReadyToRunUseCrossgen2" Value="$(PublishReadyToRunUseCrossgen2)" /> -+ <_R2RCrossgenTelemetry Include="Crossgen2PackVersion" Value="%(ResolvedCrossgen2Pack.NuGetPackageVersion)" /> -+ <_R2RCrossgenTelemetry Include="CompileListCount" Value="@(_ReadyToRunCompileList->Count())" /> -+ <_R2RCrossgenTelemetry Include="FailedCount" Value="@(_ReadyToRunCompilationFailures->Count())" /> -+ -+ - - - From 97c379f106cf8a4c192a4ce7c3108b9fc4814e77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 21:29:51 +0000 Subject: [PATCH 804/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16008) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb7ff9327..28c9fed89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 6a91d289e6c4dea319d6f634389a87cec286c52c + 3f7cbd059e147fdb3e2ba59757964256af42a342 From f0281c6e5ddb15f5c10008f97aa7386f9fa4ec27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 21:53:30 +0000 Subject: [PATCH 805/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.3 (parent: Microsoft.NET.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 383a57617..85a01b917 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 - + https://github.com/dotnet/sdk - 6843e580727326a2a832359efb1e53632c3c5094 + ccfcbe828cda905f1f995f63f26485dd9a7a7dd5 diff --git a/eng/Versions.props b/eng/Versions.props index a6ca5f5c9..f5270e35f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.12 - 8.0.100-preview.4.23206.12 - 8.0.100-preview.4.23206.12 + 8.0.100-preview.4.23206.19 + 8.0.100-preview.4.23206.19 + 8.0.100-preview.4.23206.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4c7a5835d53f83ecd9f91eb70247ce02423d04b Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 6 Apr 2023 15:33:08 -0700 Subject: [PATCH 806/864] Use artifacts and SDK from latest Preview 3 build (#15980) --- src/SourceBuild/content/eng/Versions.props | 4 +- src/SourceBuild/content/global.json | 2 +- ...ipping-non-shipping-nupkgs-for-rosly.patch | 38 +++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index aeca39941..ea82abbac 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.1.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-17.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23178.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index e59da05d1..a64d86975 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.2.23157.25" + "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch b/src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch new file mode 100644 index 000000000..8f36e6f09 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Thu, 6 Apr 2023 19:53:04 +0000 +Subject: [PATCH] Only pack the shipping/non-shipping nupkgs for roslyn + +Avoid packing release, pre-release stable nupkgs, and symbol nupkg. + +Backport: https://github.com/dotnet/roslyn/pull/67679 +--- + eng/SourceBuild.props | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index d5d41e7167e..a8b55f352ad 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -4,8 +4,21 @@ + roslyn + true + true ++ ++ false + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/eng/Versions.props b/eng/Versions.props index f5270e35f..26eceaeb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.19 - 8.0.100-preview.4.23206.19 - 8.0.100-preview.4.23206.19 + 8.0.100-preview.4.23206.20 + 8.0.100-preview.4.23206.20 + 8.0.100-preview.4.23206.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82aceab6fa3604173a8abc42e1a658da1a176686 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 03:41:10 +0000 Subject: [PATCH 809/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.22 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e171e6131..4c9b5d8e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 - + https://github.com/dotnet/sdk - 17b5a7bffde6925326d36fa02c8c5d756054f6fe + 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 9998d5a6b2424310d578d6339c708c013a4e650f + 64a1919595647685ef3800e050318da9a558839f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 26eceaeb5..c222edb0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.20 - 8.0.100-preview.4.23206.20 - 8.0.100-preview.4.23206.20 + 8.0.100-preview.4.23206.22 + 8.0.100-preview.4.23206.22 + 8.0.100-preview.4.23206.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 - 8.0.0-preview.4.23206.3 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.9 2.1.0 From 6fad2e3b62e02ad9f9295d7621db4082d9095fad Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 6 Apr 2023 23:17:45 -0700 Subject: [PATCH 810/864] Revert the changes to the files in the eng/folder --- 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 768037280..b2a4a7132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 - + https://github.com/dotnet/sdk - f926985763ae5c226cf59cd0cac8a09f38ce300d + bc516e3febc26661c9c35e756abe8d3ebb1f11e5 diff --git a/eng/Versions.props b/eng/Versions.props index 5fd9ee1c2..324ebcd81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 - 7.0.300-preview.23204.25 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 + 7.0.300-preview.23203.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3d848b253110034af6d4b2d1c332a35d7261991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 06:23:25 +0000 Subject: [PATCH 811/864] Update dependencies from https://github.com/dotnet/sdk build 20230406.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23206.24 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c9b5d8e5..8be574bee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 64a1919595647685ef3800e050318da9a558839f - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 - + https://github.com/dotnet/aspnetcore - 5d65ee05af31b5a6a0e4faec09e7501b474a997a + a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f - + https://github.com/dotnet/sdk - 16a9d6f5a2ba292fe6e5997da9d2eaaea07da780 + 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f diff --git a/eng/Versions.props b/eng/Versions.props index c222edb0b..335272601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 - 8.0.0-preview.4.23206.4 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23206.10 0.2.0 - 8.0.100-preview.4.23206.22 - 8.0.100-preview.4.23206.22 - 8.0.100-preview.4.23206.22 + 8.0.100-preview.4.23206.24 + 8.0.100-preview.4.23206.24 + 8.0.100-preview.4.23206.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 791c0da9afdad0ae6b59a69595a73fef630842d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 10:02:11 +0000 Subject: [PATCH 812/864] Update dependencies from https://github.com/dotnet/sdk build 20230407.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23206.19 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8be574bee..56100882c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a - + https://github.com/dotnet/sdk - 17e2beaa5b8b3b4824c9e6bfeff4bd9ce26de39f + fd94e8d205e471df0af26e976b2c918e8ebfe92a @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 64a1919595647685ef3800e050318da9a558839f + 38b81ba83ab2b27a730a9524401d74043d172049 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 335272601..323a8aac9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23206.24 - 8.0.100-preview.4.23206.24 - 8.0.100-preview.4.23206.24 + 8.0.100-preview.4.23207.2 + 8.0.100-preview.4.23207.2 + 8.0.100-preview.4.23207.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 - 8.0.0-preview.4.23206.9 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23206.19 2.1.0 From e7654ddf2635efd230832e1c6abce0123e8752bc Mon Sep 17 00:00:00 2001 From: mmitche Date: Fri, 7 Apr 2023 08:24:53 -0700 Subject: [PATCH 813/864] Update to new darclib --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56100882c..15954b7d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade-services - b2a77aac8c64f46101abc98fdb07a6131fae3625 + ba02feddac8c1a1c9a262af41396a28153edba22 - + https://github.com/dotnet/arcade-services - b2a77aac8c64f46101abc98fdb07a6131fae3625 + ba02feddac8c1a1c9a262af41396a28153edba22 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 323a8aac9..ad868dec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23128.1 + 1.1.0-beta.23206.1 From 789a5291b0aa7fd9c07a3abb0043c2adf601e83d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 7 Apr 2023 10:47:40 -0500 Subject: [PATCH 814/864] Enable PVP flow for deployment-tools (#16012) --- src/SourceBuild/content/repo-projects/deployment-tools.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/deployment-tools.proj b/src/SourceBuild/content/repo-projects/deployment-tools.proj index d569fd48a..f1092f16d 100644 --- a/src/SourceBuild/content/repo-projects/deployment-tools.proj +++ b/src/SourceBuild/content/repo-projects/deployment-tools.proj @@ -3,6 +3,7 @@ $(ProjectDirectory)eng\common\build$(ShellExtension) $(StandardSourceBuildArgs) + DependenciesOnly From dc84441331d76f581352eddead9260518be6b6c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 15:58:31 +0000 Subject: [PATCH 815/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16013) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 175f47cc6..9b04c04a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 78ac065ec8e1c310df94c21518371b09aec00073 + f917602fdd15cee5eff21ca6351bf902e2242d90 From 29fbe198c11dfaa27f4ee1c451ec88698c8fd7b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 16:03:47 +0000 Subject: [PATCH 816/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230407.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23207.1 -> To Version 8.0.0-alpha.1.23207.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b04c04a3..9642a7bc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - f917602fdd15cee5eff21ca6351bf902e2242d90 + 9d5fc54b0d8b201e6fcc4f894ee8d5bf8611e681 From 62e7e228e82f98e946abb33306d64a855f2b6455 Mon Sep 17 00:00:00 2001 From: mmitche Date: Fri, 7 Apr 2023 09:39:11 -0700 Subject: [PATCH 817/864] Update to new darc --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b23f9971f..37a4653de 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23128.1", + "version": "1.1.0-beta.23206.1", "commands": [ "darc" ] From 8910f1219ecd970feb6698b77a04277283832baa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 17:51:47 +0000 Subject: [PATCH 818/864] Update dependencies from https://github.com/dotnet/sdk build 20230407.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15954b7d7..dda210b1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 - + https://github.com/dotnet/sdk - fd94e8d205e471df0af26e976b2c918e8ebfe92a + 7276ede0a740fad53186b16abd6db252e3dc09a4 @@ -142,9 +142,9 @@ 27666deccccf3fc8ed40f04d2fe80e36e6186181 - + https://github.com/dotnet/runtime - 38b81ba83ab2b27a730a9524401d74043d172049 + 50c1214f049424a7ba0080626b7f07e675b34f8b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ad868dec0..4be0f8b47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23207.2 - 8.0.100-preview.4.23207.2 - 8.0.100-preview.4.23207.2 + 8.0.100-preview.4.23207.4 + 8.0.100-preview.4.23207.4 + 8.0.100-preview.4.23207.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 - 8.0.0-preview.4.23206.19 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 2.1.0 From 0bf74dd9756f281039f88dc3889b6108f4b47f24 Mon Sep 17 00:00:00 2001 From: mmitche Date: Fri, 7 Apr 2023 10:57:59 -0700 Subject: [PATCH 819/864] Workaround VMR issues --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37a4653de..72e747ba0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23206.1", + "version": "1.1.0-beta.23207.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15954b7d7..29e7407cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - - https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + + https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services + 05ebb88cb4c733d71012613696743f0c81b67c8a - - https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + + https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services + 05ebb88cb4c733d71012613696743f0c81b67c8a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ad868dec0..1e6beaed7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23206.1 + 1.1.0-beta.23207.1 From f2ab5e030380a860a487687836e2130134a0fdb9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 7 Apr 2023 12:21:52 -0700 Subject: [PATCH 820/864] Revert "Workaround VMR issues" This reverts commit 0bf74dd9756f281039f88dc3889b6108f4b47f24. --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 72e747ba0..37a4653de 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23207.1", + "version": "1.1.0-beta.23206.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d207a28a..dda210b1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - - https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services - 05ebb88cb4c733d71012613696743f0c81b67c8a + + https://github.com/dotnet/arcade-services + ba02feddac8c1a1c9a262af41396a28153edba22 - - https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services - 05ebb88cb4c733d71012613696743f0c81b67c8a + + https://github.com/dotnet/arcade-services + ba02feddac8c1a1c9a262af41396a28153edba22 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ee4544b9f..4be0f8b47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23207.1 + 1.1.0-beta.23206.1 From 3c3093ae3e76b61d2d0ea468c9f8cb02c79f4766 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 7 Apr 2023 12:21:59 -0700 Subject: [PATCH 821/864] Revert "Update to new darc" This reverts commit 62e7e228e82f98e946abb33306d64a855f2b6455. --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37a4653de..b23f9971f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23206.1", + "version": "1.1.0-beta.23128.1", "commands": [ "darc" ] From 583654007f183b74a7553a943f0f43ab432db303 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 7 Apr 2023 12:22:06 -0700 Subject: [PATCH 822/864] Revert "Update to new darclib" This reverts commit e7654ddf2635efd230832e1c6abce0123e8752bc. --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dda210b1e..7544e7c8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,13 +206,13 @@ https://github.com/dotnet/arcade 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + b2a77aac8c64f46101abc98fdb07a6131fae3625 - + https://github.com/dotnet/arcade-services - ba02feddac8c1a1c9a262af41396a28153edba22 + b2a77aac8c64f46101abc98fdb07a6131fae3625 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4be0f8b47..fe7b02e77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ - 1.1.0-beta.23206.1 + 1.1.0-beta.23128.1 From d4afec45ba90b932fbac3353b8d577553688a4c0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 7 Apr 2023 15:10:50 -0500 Subject: [PATCH 823/864] Update source-build checked-in prebuilts (#16017) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index ea82abbac..4db70b23e 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-17.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-18.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23178.1-centos.8-x64.tar.gz From fc24dbff83f60dd2474f2c79997682354d7f76f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 20:23:36 +0000 Subject: [PATCH 824/864] Update dependencies from https://github.com/dotnet/sdk build 20230407.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.9 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7544e7c8d..be9ac7ee3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e - + https://github.com/dotnet/aspnetcore - a7bf7ccdcff6475f144c300a0d21421b6efbb1b3 + 3c26dca6ec93f48426e29544a29080608330580e https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a - + https://github.com/dotnet/sdk - 7276ede0a740fad53186b16abd6db252e3dc09a4 + b9d270632df843004c29db0af12c2cf887aad70a diff --git a/eng/Versions.props b/eng/Versions.props index fe7b02e77..51db118af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 - 8.0.0-preview.4.23206.10 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 0.2.0 - 8.0.100-preview.4.23207.4 - 8.0.100-preview.4.23207.4 - 8.0.100-preview.4.23207.4 + 8.0.100-preview.4.23207.9 + 8.0.100-preview.4.23207.9 + 8.0.100-preview.4.23207.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f1eef0cc3fab6881a51258614a1af8ff0c87416e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 20:52:07 +0000 Subject: [PATCH 825/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230407.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23207.2 -> To Version 8.0.0-alpha.1.23207.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9642a7bc5..4f3624650 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 9d5fc54b0d8b201e6fcc4f894ee8d5bf8611e681 + 0cb7fd7fabd307b41430898999c9c48d5738e3d9 From 55f7cdb7aa4d25caf5d51f10c2c0a2bf32df9890 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 21:14:36 +0000 Subject: [PATCH 826/864] Update dependencies from https://github.com/dotnet/sdk build 20230407.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.8 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.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 be9ac7ee3..a8be3f4f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c - + https://github.com/dotnet/sdk - b9d270632df843004c29db0af12c2cf887aad70a + 5bf500de2fbe7c7bb7a3ec3727435b347134644c diff --git a/eng/Versions.props b/eng/Versions.props index 51db118af..bec077e10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23207.9 - 8.0.100-preview.4.23207.9 - 8.0.100-preview.4.23207.9 + 8.0.100-preview.4.23207.8 + 8.0.100-preview.4.23207.8 + 8.0.100-preview.4.23207.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dcf058b1341eb982f1c3b0bdcc61f0bf7f80f463 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 21:55:30 +0000 Subject: [PATCH 827/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230407.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23207.2 -> To Version 8.0.0-alpha.1.23207.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f3624650..97332fc1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 0cb7fd7fabd307b41430898999c9c48d5738e3d9 + dd8b5071ff8d359a7d878a7c5ac19ba40d490bb7 From 45d2ff390d1c0c6bf6d3419b9535034965837ba7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 22:57:22 +0000 Subject: [PATCH 828/864] Update dependencies from https://github.com/dotnet/sdk build 20230407.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.14 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8be3f4f8..3364fe21c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - 3c26dca6ec93f48426e29544a29080608330580e + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 - + https://github.com/dotnet/sdk - 5bf500de2fbe7c7bb7a3ec3727435b347134644c + 77bd863106f83fe759b9af7794604ac7bf0a41c9 diff --git a/eng/Versions.props b/eng/Versions.props index bec077e10..ab14602d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 0.2.0 - 8.0.100-preview.4.23207.8 - 8.0.100-preview.4.23207.8 - 8.0.100-preview.4.23207.8 + 8.0.100-preview.4.23207.14 + 8.0.100-preview.4.23207.14 + 8.0.100-preview.4.23207.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37b0180fc0512cc61fd8c8e160c82a949464cca5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 22:59:50 +0000 Subject: [PATCH 829/864] Update dependencies from https://github.com/dotnet/arcade build 20230407.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23177.4 -> To Version 8.0.0-beta.23207.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23175-02 -> To Version 1.2.0-beta-23205-03 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cd142cdf..f503d9041 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e3bfcab7b00a6345c005dad16474d2ad29d6587d - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e3bfcab7b00a6345c005dad16474d2ad29d6587d - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e3bfcab7b00a6345c005dad16474d2ad29d6587d https://github.com/dotnet/arcade-services @@ -223,9 +223,9 @@ 9d5fc54b0d8b201e6fcc4f894ee8d5bf8611e681 - + https://github.com/dotnet/sourcelink - 47edfd68f25fc5a9dd399b6e3f8f20a355f82e1a + c30453767037d81a9ab925f82736a9738004f309 diff --git a/eng/Versions.props b/eng/Versions.props index 9739bce72..c30be9a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23205.4 + 8.0.0-beta.23207.1 diff --git a/global.json b/global.json index 8e0ab15e1..5f68760b3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23205.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23205.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23207.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23207.1" } } From f68e0331328631da755d9f3ce2c4bfd13c47b91b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Apr 2023 00:33:19 +0000 Subject: [PATCH 830/864] Update dependencies from https://github.com/dotnet/sdk build 20230407.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23206.6 -> To Version 8.0.100-preview.4.23207.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23181.2 -> To Version 8.0.0-preview.4.23207.2 (parent: Microsoft.NET.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 3364fe21c..73af080d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 77bd863106f83fe759b9af7794604ac7bf0a41c9 + 15dd3db4531d5180fda8a864f3087791cb240ede diff --git a/eng/Versions.props b/eng/Versions.props index ab14602d4..36632c98c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23207.14 - 8.0.100-preview.4.23207.14 - 8.0.100-preview.4.23207.14 + 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23207.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0cd8f5573bb4737e0932a3623f990c75b75dd272 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 09:45:28 -0500 Subject: [PATCH 831/864] Manually fix vstest version to match sdk --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73af080d2..80821a16d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -137,9 +137,9 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest - 27666deccccf3fc8ed40f04d2fe80e36e6186181 + 2d656fe2133f89248825419fb8ffac5505486906 From ef4d095c984e62f68d9852ac59d717ddf776fe83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 15:03:34 +0000 Subject: [PATCH 832/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16023) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97332fc1f..082775e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - dd8b5071ff8d359a7d878a7c5ac19ba40d490bb7 + dbac2067170a66cf3c9e43bc03658062d7cd8c46 From 3fc1dda3c680af3e87934696c6b1272d2081ad68 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Apr 2023 10:46:00 -0500 Subject: [PATCH 833/864] Enable PVP flow for cecil (#16024) --- src/SourceBuild/content/repo-projects/cecil.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/cecil.proj b/src/SourceBuild/content/repo-projects/cecil.proj index 25ce5aa77..56e27ce57 100644 --- a/src/SourceBuild/content/repo-projects/cecil.proj +++ b/src/SourceBuild/content/repo-projects/cecil.proj @@ -3,6 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + DependenciesOnly From b632cd6e8a04f7e60564ad39b2f6152153d0870b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 20:26:00 +0000 Subject: [PATCH 834/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16027) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c224d9d6..2b7bc3dc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - dbac2067170a66cf3c9e43bc03658062d7cd8c46 + 51836c280a920fb25e286c81ad395a934f5bcbc0 From ba8d5e0c157349e7cd5ca959e627405dec24c2d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 20:31:20 +0000 Subject: [PATCH 835/864] [main] Update dependencies from dotnet/sdk (#16025) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.4.23207.3 to 8.0.0-preview.4.23207.6 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.4.23207.2 to 8.0.0-preview.4.23210.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b7bc3dc7..881682eb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe - + https://github.com/dotnet/aspnetcore - 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 + a419b2204d7eda5637142d03d980ee87a48054fe https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 15dd3db4531d5180fda8a864f3087791cb240ede + f6119d17d5f76f6efbe6e0e074205e0d0fa0d59d - + https://github.com/dotnet/sdk - 15dd3db4531d5180fda8a864f3087791cb240ede + f6119d17d5f76f6efbe6e0e074205e0d0fa0d59d - + https://github.com/dotnet/sdk - 15dd3db4531d5180fda8a864f3087791cb240ede + f6119d17d5f76f6efbe6e0e074205e0d0fa0d59d - + https://github.com/dotnet/sdk - 15dd3db4531d5180fda8a864f3087791cb240ede + f6119d17d5f76f6efbe6e0e074205e0d0fa0d59d @@ -142,9 +142,9 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 50c1214f049424a7ba0080626b7f07e675b34f8b + 053e17a0daf4be907db34d64fc51bc133c284fae https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 36632c98c..7a3314b4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23207.3 - 8.0.0-preview.4.23207.3 - 8.0.0-preview.4.23207.3 - 8.0.0-preview.4.23207.3 - 8.0.0-preview.4.23207.3 - 8.0.0-preview.4.23207.3 - 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.6 + 8.0.0-preview.4.23207.6 + 8.0.0-preview.4.23207.6 + 8.0.0-preview.4.23207.6 + 8.0.0-preview.4.23207.6 + 8.0.0-preview.4.23207.6 + 8.0.0-preview.4.23207.6 0.2.0 - 8.0.100-preview.4.23207.19 - 8.0.100-preview.4.23207.19 - 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23210.3 + 8.0.100-preview.4.23210.3 + 8.0.100-preview.4.23210.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23210.1 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23210.1 + 8.0.0-preview.4.23210.1 + 8.0.0-preview.4.23210.1 + 8.0.0-preview.4.23210.1 + 8.0.0-preview.4.23210.1 + 8.0.0-preview.4.23210.1 2.1.0 From 23f565e53553f0bd307c06c16cf7c9a17ea510fe Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 21:31:49 +0000 Subject: [PATCH 836/864] Add sourcelink patch to unblock source-build --- .../sourcelink/0002-Fix-FileWrites-995.patch | 276 ++++++++++++++++++ 1 file changed, 276 insertions(+) create mode 100644 src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch diff --git a/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch b/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch new file mode 100644 index 000000000..509e25465 --- /dev/null +++ b/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch @@ -0,0 +1,276 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= + +Date: Mon, 10 Apr 2023 14:25:53 -0700 +Subject: [PATCH] Fix FileWrites (#995) + +Backport: https://github.com/dotnet/sourcelink/issues/993 +--- + .../GenerateSourceLinkFileTests.cs | 4 -- + .../GenerateSourceLinkFile.cs | 16 +---- + .../build/Microsoft.SourceLink.Common.targets | 11 +++- + .../CloudHostedProvidersTests.cs | 61 ++++++++++++++----- + 4 files changed, 56 insertions(+), 36 deletions(-) + +diff --git a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs +index 50ecb7c..9234421 100644 +--- a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs ++++ b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs +@@ -40,7 +40,6 @@ public void Empty(bool noWarning) + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); + + Assert.Null(task.SourceLink); +- Assert.Null(task.FileWrite); + } + + [Theory] +@@ -73,7 +72,6 @@ public void NoRepositoryUrl(bool noWarning) + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); + + Assert.Null(task.SourceLink); +- Assert.Null(task.FileWrite); + } + + [Fact] +@@ -100,7 +98,6 @@ public void Empty_DeleteExistingFile() + string.Format(Resources.SourceLinkEmptyDeletingExistingFile, sourceLinkFile.Path), engine.Log); + + Assert.Null(task.SourceLink); +- Assert.Equal(sourceLinkFile.Path, task.FileWrite); + } + + [Fact] +@@ -235,7 +232,6 @@ public void DoesNotRewriteContentIfFileContentIsSame() + + Assert.Equal(@"{""documents"":{""/_\""_/*"":""https://raw.githubusercontent.com/repo/*""}}", File.ReadAllText(tempFile.Path, Encoding.UTF8)); + Assert.Equal(tempFile.Path, task.SourceLink); +- Assert.Equal(tempFile.Path, task.FileWrite); + + result = task.Execute(); + +diff --git a/src/SourceLink.Common/GenerateSourceLinkFile.cs b/src/SourceLink.Common/GenerateSourceLinkFile.cs +index 8a07616..859cf0d 100644 +--- a/src/SourceLink.Common/GenerateSourceLinkFile.cs ++++ b/src/SourceLink.Common/GenerateSourceLinkFile.cs +@@ -21,12 +21,6 @@ public sealed class GenerateSourceLinkFile : Task + [Required, NotNull] + public string? OutputFile { get; set; } + +- /// +- /// Set to if the output file was written to, null otherwise. +- /// +- [Output] +- public string? FileWrite { get; set; } +- + /// + /// Set to if the output Source Link file should be passed to the compiler. + /// +@@ -60,14 +54,14 @@ static string jsonEscape(string str) + + if (!localPath.EndsWithSeparator()) + { +- Log.LogError(Resources.MustEndWithDirectorySeparator, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); ++ Log.LogError(Resources.MustEndWithDirectorySeparator, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); + success = false; + continue; + } + + if (localPath.Contains('*')) + { +- Log.LogError(Resources.MustNotContainWildcard, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); ++ Log.LogError(Resources.MustNotContainWildcard, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); + success = false; + continue; + } +@@ -127,7 +121,6 @@ private void WriteSourceLinkFile(string? content) + Log.LogMessage(Resources.SourceLinkEmptyDeletingExistingFile, OutputFile); + + File.Delete(OutputFile); +- FileWrite = OutputFile; + return; + } + +@@ -151,14 +144,11 @@ private void WriteSourceLinkFile(string? content) + + Log.LogMessage(Resources.SourceLinkFileUpdated, OutputFile); + File.WriteAllText(OutputFile, content); +- FileWrite = SourceLink = OutputFile; ++ SourceLink = OutputFile; + } + catch (Exception e) + { + Log.LogError(Resources.ErrorWritingToSourceLinkFile, OutputFile, e.Message); +- +- // Part of the file might have been written. +- FileWrite = OutputFile; + } + } + } +diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets +index ea05b19..0f9a861 100644 +--- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets ++++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets +@@ -58,11 +58,16 @@ + + + +- +- +- + + ++ ++ ++ ++ ++ + + + +diff --git a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs +index 8a91a9a..58129d0 100644 +--- a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs ++++ b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs +@@ -131,6 +131,11 @@ public void NoCommit_NoRemote_NoWarnings() + + + ++ ++ ++ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> ++ ++ + """, + customTargets: "", + targets: new[] +@@ -141,11 +146,13 @@ public void NoCommit_NoRemote_NoWarnings() + { + "@(SourceRoot)", + "$(SourceLink)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { + NuGetPackageFolders, + "", ++ "", + }); + } + +@@ -160,6 +167,11 @@ public void Commit_NoRemote_NoWarnings() + + + ++ ++ ++ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> ++ ++ + """, + customTargets: "", + targets: new[] +@@ -170,12 +182,14 @@ public void Commit_NoRemote_NoWarnings() + { + "@(SourceRoot)", + "$(SourceLink)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { + NuGetPackageFolders, + ProjectSourceRoot, + "", ++ "", + }); + } + +@@ -190,6 +204,11 @@ public void NoCommit_Remote_NoWarnings() + + + ++ ++ ++ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> ++ ++ + """, + customTargets: "", + targets: new[] +@@ -200,11 +219,13 @@ public void NoCommit_Remote_NoWarnings() + { + "@(SourceRoot)", + "$(SourceLink)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { + NuGetPackageFolders, + "", ++ "", + }); + } + +@@ -230,21 +251,27 @@ public void CustomTranslation() + DependsOnTargets=""$(SourceControlManagerUrlTranslationTargets)"" + BeforeTargets=""SourceControlManagerPublishTranslatedUrls""> + +- +- <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) +- <_Replacement>https://github.com/$2/$3 +- +- +- +- $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) +- +- +- +- +- $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) +- +- +- ++ ++ <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) ++ <_Replacement>https://github.com/$2/$3 ++ ++ ++ ++ $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) ++ ++ ++ ++ ++ $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) ++ ++ ++ ++ ++ ++ ++ <_SourceLinkFileWrites Include=""@(FileWrites)"" Condition=""$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))""/> ++ ++ + ", + targets: new[] + { +@@ -256,7 +283,8 @@ public void CustomTranslation() + "@(SourceRoot->'%(SourceLinkUrl)')", + "$(SourceLink)", + "$(PrivateRepositoryUrl)", +- "$(RepositoryUrl)" ++ "$(RepositoryUrl)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { +@@ -266,6 +294,7 @@ public void CustomTranslation() + s_relativeSourceLinkJsonPath, + $"https://github.com/test-org/{repoName}", + $"https://github.com/test-org/{repoName}", ++ s_relativeSourceLinkJsonPath + }); + + AssertEx.AreEqual( From 8adfab91ad5c96074de1c8edd9721e3dcc43bde2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 22:10:22 +0000 Subject: [PATCH 837/864] Revert sourcelink patch, will need to flow in latest version --- .../sourcelink/0002-Fix-FileWrites-995.patch | 276 ------------------ 1 file changed, 276 deletions(-) delete mode 100644 src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch diff --git a/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch b/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch deleted file mode 100644 index 509e25465..000000000 --- a/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch +++ /dev/null @@ -1,276 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= - -Date: Mon, 10 Apr 2023 14:25:53 -0700 -Subject: [PATCH] Fix FileWrites (#995) - -Backport: https://github.com/dotnet/sourcelink/issues/993 ---- - .../GenerateSourceLinkFileTests.cs | 4 -- - .../GenerateSourceLinkFile.cs | 16 +---- - .../build/Microsoft.SourceLink.Common.targets | 11 +++- - .../CloudHostedProvidersTests.cs | 61 ++++++++++++++----- - 4 files changed, 56 insertions(+), 36 deletions(-) - -diff --git a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs -index 50ecb7c..9234421 100644 ---- a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs -+++ b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs -@@ -40,7 +40,6 @@ public void Empty(bool noWarning) - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); - - Assert.Null(task.SourceLink); -- Assert.Null(task.FileWrite); - } - - [Theory] -@@ -73,7 +72,6 @@ public void NoRepositoryUrl(bool noWarning) - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); - - Assert.Null(task.SourceLink); -- Assert.Null(task.FileWrite); - } - - [Fact] -@@ -100,7 +98,6 @@ public void Empty_DeleteExistingFile() - string.Format(Resources.SourceLinkEmptyDeletingExistingFile, sourceLinkFile.Path), engine.Log); - - Assert.Null(task.SourceLink); -- Assert.Equal(sourceLinkFile.Path, task.FileWrite); - } - - [Fact] -@@ -235,7 +232,6 @@ public void DoesNotRewriteContentIfFileContentIsSame() - - Assert.Equal(@"{""documents"":{""/_\""_/*"":""https://raw.githubusercontent.com/repo/*""}}", File.ReadAllText(tempFile.Path, Encoding.UTF8)); - Assert.Equal(tempFile.Path, task.SourceLink); -- Assert.Equal(tempFile.Path, task.FileWrite); - - result = task.Execute(); - -diff --git a/src/SourceLink.Common/GenerateSourceLinkFile.cs b/src/SourceLink.Common/GenerateSourceLinkFile.cs -index 8a07616..859cf0d 100644 ---- a/src/SourceLink.Common/GenerateSourceLinkFile.cs -+++ b/src/SourceLink.Common/GenerateSourceLinkFile.cs -@@ -21,12 +21,6 @@ public sealed class GenerateSourceLinkFile : Task - [Required, NotNull] - public string? OutputFile { get; set; } - -- /// -- /// Set to if the output file was written to, null otherwise. -- /// -- [Output] -- public string? FileWrite { get; set; } -- - /// - /// Set to if the output Source Link file should be passed to the compiler. - /// -@@ -60,14 +54,14 @@ static string jsonEscape(string str) - - if (!localPath.EndsWithSeparator()) - { -- Log.LogError(Resources.MustEndWithDirectorySeparator, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); -+ Log.LogError(Resources.MustEndWithDirectorySeparator, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); - success = false; - continue; - } - - if (localPath.Contains('*')) - { -- Log.LogError(Resources.MustNotContainWildcard, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); -+ Log.LogError(Resources.MustNotContainWildcard, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); - success = false; - continue; - } -@@ -127,7 +121,6 @@ private void WriteSourceLinkFile(string? content) - Log.LogMessage(Resources.SourceLinkEmptyDeletingExistingFile, OutputFile); - - File.Delete(OutputFile); -- FileWrite = OutputFile; - return; - } - -@@ -151,14 +144,11 @@ private void WriteSourceLinkFile(string? content) - - Log.LogMessage(Resources.SourceLinkFileUpdated, OutputFile); - File.WriteAllText(OutputFile, content); -- FileWrite = SourceLink = OutputFile; -+ SourceLink = OutputFile; - } - catch (Exception e) - { - Log.LogError(Resources.ErrorWritingToSourceLinkFile, OutputFile, e.Message); -- -- // Part of the file might have been written. -- FileWrite = OutputFile; - } - } - } -diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets -index ea05b19..0f9a861 100644 ---- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets -+++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets -@@ -58,11 +58,16 @@ - - - -- -- -- - - -+ -+ -+ -+ -+ - - - -diff --git a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs -index 8a91a9a..58129d0 100644 ---- a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs -+++ b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs -@@ -131,6 +131,11 @@ public void NoCommit_NoRemote_NoWarnings() - - - -+ -+ -+ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> -+ -+ - """, - customTargets: "", - targets: new[] -@@ -141,11 +146,13 @@ public void NoCommit_NoRemote_NoWarnings() - { - "@(SourceRoot)", - "$(SourceLink)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { - NuGetPackageFolders, - "", -+ "", - }); - } - -@@ -160,6 +167,11 @@ public void Commit_NoRemote_NoWarnings() - - - -+ -+ -+ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> -+ -+ - """, - customTargets: "", - targets: new[] -@@ -170,12 +182,14 @@ public void Commit_NoRemote_NoWarnings() - { - "@(SourceRoot)", - "$(SourceLink)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { - NuGetPackageFolders, - ProjectSourceRoot, - "", -+ "", - }); - } - -@@ -190,6 +204,11 @@ public void NoCommit_Remote_NoWarnings() - - - -+ -+ -+ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> -+ -+ - """, - customTargets: "", - targets: new[] -@@ -200,11 +219,13 @@ public void NoCommit_Remote_NoWarnings() - { - "@(SourceRoot)", - "$(SourceLink)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { - NuGetPackageFolders, - "", -+ "", - }); - } - -@@ -230,21 +251,27 @@ public void CustomTranslation() - DependsOnTargets=""$(SourceControlManagerUrlTranslationTargets)"" - BeforeTargets=""SourceControlManagerPublishTranslatedUrls""> - -- -- <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) -- <_Replacement>https://github.com/$2/$3 -- -- -- -- $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -- -- -- -- -- $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -- -- -- -+ -+ <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) -+ <_Replacement>https://github.com/$2/$3 -+ -+ -+ -+ $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -+ -+ -+ -+ -+ $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -+ -+ -+ -+ -+ -+ -+ <_SourceLinkFileWrites Include=""@(FileWrites)"" Condition=""$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))""/> -+ -+ - ", - targets: new[] - { -@@ -256,7 +283,8 @@ public void CustomTranslation() - "@(SourceRoot->'%(SourceLinkUrl)')", - "$(SourceLink)", - "$(PrivateRepositoryUrl)", -- "$(RepositoryUrl)" -+ "$(RepositoryUrl)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { -@@ -266,6 +294,7 @@ public void CustomTranslation() - s_relativeSourceLinkJsonPath, - $"https://github.com/test-org/{repoName}", - $"https://github.com/test-org/{repoName}", -+ s_relativeSourceLinkJsonPath - }); - - AssertEx.AreEqual( From 14db392daec173ffccaec2209d0e9b5b71dddd1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 23:05:41 +0000 Subject: [PATCH 838/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16031) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 881682eb0..1c8ded109 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 51836c280a920fb25e286c81ad395a934f5bcbc0 + 8632a4c5dd73725869fc33f1c466d81b2667386f From 2d5475e1cd5108ad3a661de30717cc494cbb4a73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Apr 2023 23:10:57 +0000 Subject: [PATCH 839/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230410.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23210.4 -> To Version 8.0.0-alpha.1.23210.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c8ded109..98410e35f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8632a4c5dd73725869fc33f1c466d81b2667386f + f43e7ac7040fa13408a8c2475e5ba76f33402ad2 From e26eba9782188549dcf48844ca236b38994b27a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 01:23:20 +0000 Subject: [PATCH 840/864] Update dependencies from https://github.com/dotnet/arcade build 20230410.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23177.4 -> To Version 8.0.0-beta.23210.2 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23175-02 -> To Version 1.2.0-beta-23205-03 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f503d9041..c16d3fc4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - e3bfcab7b00a6345c005dad16474d2ad29d6587d + 999d8ef7cd34c754502a1fa6b17b19c3eb42348c - + https://github.com/dotnet/arcade - e3bfcab7b00a6345c005dad16474d2ad29d6587d + 999d8ef7cd34c754502a1fa6b17b19c3eb42348c - + https://github.com/dotnet/arcade - e3bfcab7b00a6345c005dad16474d2ad29d6587d + 999d8ef7cd34c754502a1fa6b17b19c3eb42348c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c30be9a74..7bab9f75b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23207.1 + 8.0.0-beta.23210.2 diff --git a/global.json b/global.json index 5f68760b3..706841059 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23207.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23207.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.2" } } From a8a1a0e8a5acc4fec80e71eb00f5d9d653a58410 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 21:08:29 -0500 Subject: [PATCH 841/864] Manually updating to latest arcade since darc is failing to do so --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c16d3fc4c..fbc2ccad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 999d8ef7cd34c754502a1fa6b17b19c3eb42348c + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 999d8ef7cd34c754502a1fa6b17b19c3eb42348c + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 999d8ef7cd34c754502a1fa6b17b19c3eb42348c + e5c569253a4cecd110830acbf1ffae96d5a37cc6 https://github.com/dotnet/arcade-services @@ -223,9 +223,9 @@ 9d5fc54b0d8b201e6fcc4f894ee8d5bf8611e681 - + https://github.com/dotnet/sourcelink - c30453767037d81a9ab925f82736a9738004f309 + 759f344923a0859f3fae83431d0ba1cc62108118 diff --git a/eng/Versions.props b/eng/Versions.props index 7bab9f75b..6792592ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23210.2 + 8.0.0-beta.23210.3 diff --git a/global.json b/global.json index 706841059..81617e22f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.3" } } From c6004b39b2956ae59af5c59084924ede33ecef9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:32:50 +0000 Subject: [PATCH 842/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16035) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d192dd79..436a135e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - f43e7ac7040fa13408a8c2475e5ba76f33402ad2 + c053ca210364dfa4904006b811249f14743e853e From 87ee87a3af643c342f818ba2dd56de378d7fcc2f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 11 Apr 2023 12:08:45 -0500 Subject: [PATCH 843/864] Add cecil project to dotnet source-build project (#16037) --- src/SourceBuild/content/repo-projects/dotnet.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index e2ffd5256..0a9a4ecec 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -22,6 +22,7 @@ + From 6cc3b3e77b5c95944318bd433356b481c95c366f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 11 Apr 2023 13:27:30 -0500 Subject: [PATCH 844/864] Add sourcelink source-build patch to address prebuilts (#16041) --- ...-dotnet-sourcelink-from-source-build.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/patches/sourcelink/0002-Exclude-dotnet-sourcelink-from-source-build.patch diff --git a/src/SourceBuild/patches/sourcelink/0002-Exclude-dotnet-sourcelink-from-source-build.patch b/src/SourceBuild/patches/sourcelink/0002-Exclude-dotnet-sourcelink-from-source-build.patch new file mode 100644 index 000000000..2c72fc0fb --- /dev/null +++ b/src/SourceBuild/patches/sourcelink/0002-Exclude-dotnet-sourcelink-from-source-build.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Tue, 11 Apr 2023 17:03:48 +0000 +Subject: [PATCH] Exclude dotnet-sourcelink from source build + +This addresses prebuilts. + +Backport: https://github.com/dotnet/sourcelink/pull/933 +--- + src/dotnet-sourcelink/dotnet-sourcelink.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj +index f2a6e7a..5c675ef 100644 +--- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj ++++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj +@@ -2,6 +2,7 @@ + + Exe + $(NetCurrent) ++ true + + + true From 5fba2e8e33eaca56397e958e5ff64b7d5f420dbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:29:06 +0000 Subject: [PATCH 845/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16040) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 436a135e4..29fbefa13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c053ca210364dfa4904006b811249f14743e853e + 01850f2b7bff23e118d1faecb941d770c8e626f2 From ef03f13dca03ac0ac33f82f11d1ddb354bd66f46 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 11 Apr 2023 16:31:47 -0500 Subject: [PATCH 846/864] Update SB artifact references for 8.0 Preview 3 release (#16055) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 4db70b23e..cf5bcd7b9 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-18.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23178.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz From debce56e732982639e821d56484b2de4821028f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 21:34:22 +0000 Subject: [PATCH 847/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230411.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23211.4 -> To Version 8.0.0-alpha.1.23211.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29fbefa13..0ee469b05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 01850f2b7bff23e118d1faecb941d770c8e626f2 + eb4a60b9af1492e259a79e35cf4217f3546583f6 From 9c09584fae9e4642521590b7879bb61e27bece2c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 11 Apr 2023 16:36:10 -0500 Subject: [PATCH 848/864] Update source tarball build instructions (#16057) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b942bb7c..7890f5897 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Further instructions on how to build inside of the Codespace will be available u ```bash cd /path/to/complete/dotnet/sources - ./prep.sh + ./prep.sh --bootstrap ``` 3. Build the .NET SDK From c26e28c134b7d190396c8d6c9d2be4d957a01ad2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 23:42:42 +0000 Subject: [PATCH 849/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230411.6 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23211.4 -> To Version 8.0.0-alpha.1.23211.6 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ee469b05..bd3354125 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - eb4a60b9af1492e259a79e35cf4217f3546583f6 + 8f40f1f4b41ad2289de5f8064a18c4c1356a0bd4 From c1e8222d0e0667ac6bfc211a81b0eccfbc9b99b1 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 12 Apr 2023 07:47:51 -0500 Subject: [PATCH 850/864] Update source-build prebuilts (#16065) --- src/SourceBuild/content/eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index cf5bcd7b9..e5e80ae70 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -19,7 +19,7 @@ prep.sh and pipeline scripts, outside of MSBuild. --> https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-18.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-19.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz From ae6ca46a18118c398c26ff166c7a143e84f65ece Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 08:49:23 -0700 Subject: [PATCH 851/864] [main] Update dependencies from dotnet/source-build-reference-packages (#16070) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd3354125..af8e4c557 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8f40f1f4b41ad2289de5f8064a18c4c1356a0bd4 + 02ee87c8a232a9786b56cd2102cf318559e72210 From 0a85997537731a807885afacd2e0139de8500fd2 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Wed, 12 Apr 2023 09:37:28 -0700 Subject: [PATCH 852/864] Create snapcraft.yaml --- src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml | 41 ++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml diff --git a/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml new file mode 100644 index 000000000..b1b80a2d1 --- /dev/null +++ b/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml @@ -0,0 +1,41 @@ +name: dotnet-sdk +version: 8.0.100-preview.3.23178.7 +summary: Cross-Platform .NET Core SDK +description: | + .NET Core SDK. https://dot.net/core. + +grade: stable +confinement: classic + +apps: + dotnet: + command: dotnet + +base: core18 + +parts: + dotnet-sdk: + plugin: dump + source: https://download.visualstudio.microsoft.com/download/pr/103d5e2c-d5c4-4101-bb6e-b82bc73a7d93/284a5cdccbc995f39806a3ba2dc17b93/dotnet-sdk-8.0.100-preview.3.23178.7-linux-x64.tar.gz + source-checksum: sha512/3b5d72979831256b9340a01db23d3b2dca801672546eeed04385949ed5f4363d3c731f31477ec82c7200ce88502dc45e03986c8acc8f2fc611b0343af5f1c488 + stage-packages: + - libicu60 + - libc6 + - libgcc1 + - libstdc++6 + - libssl1.0.0 + - libcurl3 + - libgssapi-krb5-2 + - zlib1g + - lldb + - libunwind8 + - libtinfo5 + - liblttng-ust0 + - liburcu6 + + runtime-wrapper: + plugin: dump + source: . + + + From 9586d0d9e20b8863590709e427135be8bbc47516 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Wed, 12 Apr 2023 09:38:35 -0700 Subject: [PATCH 853/864] Update snapcraft.yaml --- src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml index 5463efd62..597f3985f 100644 --- a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 7.0.100-preview.1.22110.4 +version: 7.0.203 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,8 +16,8 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/1af9d3c3-a20e-400c-abe5-3d80dec7b63b/803f8dc5cf21fb28245aba71a7fdbc05/dotnet-sdk-7.0.100-preview.1.22110.4-linux-x64.tar.gz - source-checksum: sha512/54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2 + source: https://download.visualstudio.microsoft.com/download/pr/ebfd0bf8-79bd-480a-9e81-0b217463738d/9adc6bf0614ce02670101e278a2d8555/dotnet-sdk-7.0.203-linux-x64.tar.gz + source-checksum: sha512/ed1ae7cd88591ec52e1515c4a25d9a832eca29e8a0889549fea35a320e6e356e3806a17289f71fc0b04c36b006ae74446c53771d976c170fcbe5977ac7db1cb6 stage-packages: - libicu60 - libc6 @@ -36,3 +36,6 @@ parts: runtime-wrapper: plugin: dump source: . + + + From da336f2877cedc26d60f426cefe6295ecc1d74f3 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Wed, 12 Apr 2023 09:39:06 -0700 Subject: [PATCH 854/864] Update snapcraft.yaml --- src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml | 31 ++++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml index bfbe2c9a4..0d2bd36c4 100755 --- a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 6.0.100-preview.2.21155.3 +version: 6.0.408 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,21 +16,26 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/25c7e38e-0a6a-4d66-ac4e-b550a44b8a98/49128be84b903799259e7bebe8e9d969/dotnet-sdk-6.0.100-preview.2.21155.3-linux-x64.tar.gz - source-checksum: sha512/90d9b6070f7732dcf75f5a09a4f10f9b23c835a3bb144e0c3f1fa451cadd3d49c9781973b180f70a4d2798358a7c00f3c0b9b3bf35326fe4c94e470e84ac8c35 + source: https://download.visualstudio.microsoft.com/download/pr/dd7d2255-c9c1-4c6f-b8ad-6e853d6bb574/c8e1b5f47bf17b317a84487491915178/dotnet-sdk-6.0.408-linux-x64.tar.gz + source-checksum: sha512/d5eed37ce6c07546aa217d6e786f3b67be2b6d97c23d5888d9ee5d5398e8a9bfc06202b14e3529245f7ec78f4036778caf69bdbe099de805fe1f566277e8440e stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 + - libicu60 + - libc6 + - libgcc1 + - libstdc++6 + - libssl1.0.0 + - libcurl3 + - libgssapi-krb5-2 + - zlib1g + - lldb + - libunwind8 + - libtinfo5 + - liblttng-ust0 + - liburcu6 runtime-wrapper: plugin: dump source: . + + From 9215a5792efd51597ae23e904e3563056eb2698b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:33:29 -0700 Subject: [PATCH 855/864] [main] Update dependencies from dotnet/arcade (#16071) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af8e4c557..8cdd330a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 https://github.com/dotnet/arcade-services @@ -223,14 +223,14 @@ 02ee87c8a232a9786b56cd2102cf318559e72210 - + https://github.com/dotnet/sourcelink 759f344923a0859f3fae83431d0ba1cc62108118 - + https://github.com/dotnet/xliff-tasks - a0d9b0e10c67721157c066abb9210d1e3e774014 + 519d565b45c46ac452fe5a77ab63295138992e07 diff --git a/eng/Versions.props b/eng/Versions.props index c5b45b7de..c9a2175bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23210.3 + 8.0.0-beta.23211.8 diff --git a/global.json b/global.json index 81617e22f..97875b19a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.1.23115.2", + "dotnet": "8.0.100-preview.3.23178.7", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23211.8" } } From 6f5138826c8eae766d54d499ab1c7b9c9d0e9bc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 19:12:29 +0000 Subject: [PATCH 856/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230412.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23212.2 -> To Version 8.0.0-alpha.1.23212.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cdd330a1..dae6f7981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 02ee87c8a232a9786b56cd2102cf318559e72210 + 4c32e59ca9d197152781cbc4c424987667bd2d05 From dc76a05e0ba0da27c7092cfe8db10f37569e65cb Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Apr 2023 15:31:37 -0500 Subject: [PATCH 857/864] Add CA1512 NoWarn for aspnetcore (#16076) --- .../content/repo-projects/aspnetcore.proj | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index abd2b580e..17aef7931 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -24,16 +24,9 @@ true - - CS0618;CA1825;CS8600;CS8604 + + CA1512 From 667f4ec709a05f602a02092b5edb9d7409986a4f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 12 Apr 2023 13:31:40 -0700 Subject: [PATCH 858/864] Update implicit versions for the April release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c9a2175bb..bbcd03f98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,8 +22,8 @@ 30 32 17 - 15 - 2 + 16 + 5 From f2d17c523c08f4f4864a54bb6d717f9a5f3c8f79 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Apr 2023 15:54:05 -0500 Subject: [PATCH 859/864] Update poison baseline (#16079) --- .../assets/baselines/PoisonUsage.txt | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 02d2c7cf5..0cd3b4111 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1,58 +1,4 @@ - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute From 0c5d3f4dd4abde3aad7c40e162794ef040ac4b9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 21:07:51 +0000 Subject: [PATCH 860/864] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230412.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23212.2 -> To Version 8.0.0-alpha.1.23212.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dae6f7981..3f62c08e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 4c32e59ca9d197152781cbc4c424987667bd2d05 + 9092071034fa818fef8b8fd6ae9ac32c826ef040 From 65f90d5084c6a4afeb68ac712d46c8681dbd66de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Apr 2023 08:29:27 +0000 Subject: [PATCH 861/864] Update dependencies from https://github.com/dotnet/test-templates build 20230413.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23204.1 -> To Version 1.1.0-rc.23213.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f62c08e6..1f4290422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c9a2175bb..3e739268c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 From 47b2840867720b136d5a09c9338d142c569cb669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 13 Apr 2023 15:53:12 +0200 Subject: [PATCH 862/864] Add `blazor-web.js` to allowed binaries (#16095) --- src/VirtualMonoRepo/allowed-binaries.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/VirtualMonoRepo/allowed-binaries.txt b/src/VirtualMonoRepo/allowed-binaries.txt index 0300eff23..e9217aaed 100644 --- a/src/VirtualMonoRepo/allowed-binaries.txt +++ b/src/VirtualMonoRepo/allowed-binaries.txt @@ -29,8 +29,7 @@ src/aspnetcore/src/*.otf src/aspnetcore/src/*.ttf src/aspnetcore/src/*.woff src/aspnetcore/src/*.woff2 -src/aspnetcore/src/Components/Web.JS/dist/Release/blazor.server.js # JavaScript file with a null byte -src/aspnetcore/src/Components/Web.JS/dist/Release/blazor.webview.js # JavaScript file with a null byte +src/aspnetcore/src/Components/Web.JS/dist/Release/blazor.*.js # JavaScript files with a null bytes src/aspnetcore/src/ProjectTemplates/Web.ProjectTemplates/**/app.db src/aspnetcore/src/submodules/spa-templates/**/app.db From b2855291a07e2b1bc9932cf9715f938aedd2cab5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 13 Apr 2023 09:43:34 -0500 Subject: [PATCH 863/864] Update MAUI baseline manifests for 8 Preview 4 In c29cfc12, we updated the MAUI baseline manifests so our public preview 2 packages were in the .NET SDK for 8 Preview 3. Update to MAUI .NET 8 Preview 3 manifests for Preview 4. We should also be able to remove the `xamarin-impl` feed from the `NuGet.config`, as that was only used for early .NET 6 releases. --- NuGet.config | 2 -- eng/Versions.props | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 77050d5f1..0e9b1bf09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,6 @@ - - diff --git a/eng/Versions.props b/eng/Versions.props index 3e739268c..5661a6b98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,13 +223,13 @@ - 8.0.100-preview.2 - 8.0.0-preview.2.7871 - 34.0.0-preview.2.187 - 16.2.374-net8-p2 - 16.2.374-net8-p2 - 13.1.374-net8-p2 - 16.1.1162-net8-p2 + 8.0.100-preview.3 + 8.0.0-preview.3.8149 + 34.0.0-preview.3.224 + 16.2.462-net8-p3 + 16.2.462-net8-p3 + 13.1.462-net8-p3 + 16.1.1250-net8-p3 8.0.0-preview.4.23170.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) From eb8fffd0ecb152fd2dac8d3c42f62230fa64880e Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 13 Apr 2023 14:52:55 -0500 Subject: [PATCH 864/864] Enable PVP flow for command-line-api (#16109) --- .../repo-projects/command-line-api.proj | 1 + ...-TFM-when-building-with-source-build.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch diff --git a/src/SourceBuild/content/repo-projects/command-line-api.proj b/src/SourceBuild/content/repo-projects/command-line-api.proj index 5b5e67332..7c799ae2a 100644 --- a/src/SourceBuild/content/repo-projects/command-line-api.proj +++ b/src/SourceBuild/content/repo-projects/command-line-api.proj @@ -9,6 +9,7 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) true + DependenciesOnly diff --git a/src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch b/src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch new file mode 100644 index 000000000..78fa7b0cc --- /dev/null +++ b/src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 6 Apr 2023 09:16:13 -0500 +Subject: [PATCH] Use net8.0 TFM when building with source-build + +Backport: https://github.com/dotnet/command-line-api/pull/2150 +--- + Directory.Build.props | 6 +++--- + .../System.CommandLine.Benchmarks.csproj | 4 ++-- + src/System.CommandLine/System.CommandLine.csproj | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 4c1f04a2..0444426a 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -11,11 +11,11 @@ + 10.0 + + +- +- net7.0 ++ ++ $(NetCurrent) + + +- ++ + net7.0 + + +diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj +index b63e109c..3ef1afa1 100644 +--- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj ++++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj +@@ -9,8 +9,8 @@ + false + + +- net7.0 +- net7.0 ++ $(TargetFrameworkForNETSDK) ++ $(TargetFrameworkForNETSDK) + + + False +diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj +index 05d28476..37115d70 100644 +--- a/src/System.CommandLine/System.CommandLine.csproj ++++ b/src/System.CommandLine/System.CommandLine.csproj +@@ -3,7 +3,7 @@ + + true + System.CommandLine +- net7.0;netstandard2.0 ++ $(TargetFrameworkForNETSDK);netstandard2.0 + enable + true + 10 +@@ -18,7 +18,7 @@ + true + + +- ++ + true + true +