From 09a60fcb5ff839a7ecf5a9c97f19dd9e69efa004 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 10 Mar 2022 16:47:16 -0800 Subject: [PATCH 01/10] Update the nuspec as well to remove the duplicates --- .../VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec | 4 ++-- .../VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec index 4d5b44e81..ffba8a6d9 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec index 6b60dae86..5f646a6ce 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From a623165837acd2b5d3ef2d8f00176ccd1da38142 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 10:29:27 -0800 Subject: [PATCH 02/10] Remove emscripten coherency depedency --- 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 359567ebb..a1798b383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,11 +166,11 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac - + https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac From 37f553ace2c7a632aac1b7f1094010a9f6db170e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Mar 2022 16:49:39 -0800 Subject: [PATCH 03/10] Add additional architecture --- src/SdkResolver/SdkResolver.csproj | 2 ++ src/VSTemplateLocator/VSTemplateLocator.csproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index e923b917e..5dc640f4e 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -14,6 +14,7 @@ + <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_SdkResolverSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" /> <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj index 5f5b60dff..aa6472a77 100644 --- a/src/VSTemplateLocator/VSTemplateLocator.csproj +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -14,6 +14,7 @@ + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-arm64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-arm64\native\hostfxr.dll" Arch="arm64\" /> <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" /> <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> From b054be41f99fef02f09c74c9dc9cc5eab35ca4d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Mar 2022 20:14:02 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/sdk build 20220314.6 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.6 --- 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 6e314d6b2..f36984653 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 5a3930c1a880b9c7abce72fda22e4505f33b12d9 + cac66e777a95c83bf4a14608f1ebfda7c10f6083 - + https://github.com/dotnet/sdk - 5a3930c1a880b9c7abce72fda22e4505f33b12d9 + cac66e777a95c83bf4a14608f1ebfda7c10f6083 diff --git a/eng/Versions.props b/eng/Versions.props index c6a684c30..b59542b97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22163.5 - 6.0.300-preview.22163.5 + 6.0.300-preview.22164.6 + 6.0.300-preview.22164.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2621d473d831e1e1528172c1343e0c6ac616588 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:24:26 -0700 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/arcade build 20220311.1 (#13405) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22161.1 Dependency coherency updates Microsoft.SourceBuild.Intermediate.source-build From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 ---- eng/Version.Details.xml | 16 ++--- eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 69 +++---------------- eng/common/templates/jobs/codeql-build.yml | 2 +- eng/common/templates/steps/execute-sdl.yml | 68 ++++++++++++++++++ .../templates/variables/sdl-variables.yml | 7 ++ global.json | 6 +- 8 files changed, 97 insertions(+), 85 deletions(-) create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index 774c3b7b8..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,16 @@ - - - - - - - @@ -42,16 +35,11 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1798b383..794259a0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ https://github.com/dotnet/emsdk ee0a97a0009c0e048789126253fea7994db676ac - + https://github.com/dotnet/source-build - 90bdf447e1b97605f109b34243ab8c9f215308e9 + 10d0f7e94aa45889155c312f51cfc01bf326b853 @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4e112b3f1..3c5ffbd69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22122.7 + 6.0.0-beta.22161.1 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index d0a1ea8b0..24cec0424 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -43,14 +43,9 @@ jobs: value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId value: ${{ parameters.AzDOBuildId }} - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.110.1 + - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config 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') }}: @@ -126,57 +121,11 @@ jobs: displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() + - template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: ${{ parameters.additionalParameters }} + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4a..54c393af4 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -21,7 +21,7 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.109.0 + value: 0.110.1 - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - name: GuardianVersion diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml new file mode 100644 index 000000000..7b8ee18a2 --- /dev/null +++ b/eng/common/templates/steps/execute-sdl.yml @@ -0,0 +1,68 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml new file mode 100644 index 000000000..1a860bd04 --- /dev/null +++ b/eng/common/templates/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.110.1 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 8a183c7de..3778b80ba 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.101", + "dotnet": "6.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22122.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From a882615ccd6cf0a86ab7d26b99277a6e6f65e5bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:26:07 -0700 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 (#13409) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22161.1 Dependency coherency updates Microsoft.SourceBuild.Intermediate.source-build From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk 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 794259a0c..9930299ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,9 +215,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - 2bd5e08a5ede56b51ea88ac3deecde19c5c520cb + a4550df3cb245c4dfd9601c67f86a27a88aad962 From ab3ddec440c5bd51661f82650bd949a4b69d35da Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 14 Mar 2022 14:27:34 -0700 Subject: [PATCH 07/10] Revert prior changes as only the first and last change were actually needed. --- src/redist/targets/GenerateMSIs.targets | 13 +++++-------- ...ist.Common.Net.Core.SDK.MSBuildExtensions.nuspec | 4 ++-- ...ist.Common.Net.Core.SDK.VSTemplateLocator.nuspec | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index c56cf824b..d306f311e 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -480,7 +480,7 @@ + '$(SdkMSBuildExtensionsNupkgFile)'" /> - + '$(VSTemplateLocatorNupkgFile)'" /> diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec index ffba8a6d9..4d5b44e81 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions 1.0.0 - VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$ + VS.Redist.Common.Net.Core.SDK.MSBuildExtensions Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec index 5f646a6ce..6b60dae86 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator 1.0.0 - VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$ + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From 681bebd311b4aab93183189f5ef6f252127be654 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Mar 2022 23:55:32 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/sdk build 20220314.17 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.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 f36984653..5efcc6748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - cac66e777a95c83bf4a14608f1ebfda7c10f6083 + fa2be1406598f8e473af9061e07488ae0778ea11 - + https://github.com/dotnet/sdk - cac66e777a95c83bf4a14608f1ebfda7c10f6083 + fa2be1406598f8e473af9061e07488ae0778ea11 diff --git a/eng/Versions.props b/eng/Versions.props index b59542b97..6b0c3c14b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22164.6 - 6.0.300-preview.22164.6 + 6.0.300-preview.22164.17 + 6.0.300-preview.22164.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 75bdbcd4e17dc6ab5022a5592dada6913ec5e419 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Mar 2022 08:47:11 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/sdk build 20220315.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.1 --- 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 5efcc6748..ce14fae35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - fa2be1406598f8e473af9061e07488ae0778ea11 + 5f2d500e43184a2d173f3a0b4252384016c29eff - + https://github.com/dotnet/sdk - fa2be1406598f8e473af9061e07488ae0778ea11 + 5f2d500e43184a2d173f3a0b4252384016c29eff diff --git a/eng/Versions.props b/eng/Versions.props index 6b0c3c14b..6201d7ee5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22164.17 - 6.0.300-preview.22164.17 + 6.0.300-preview.22165.1 + 6.0.300-preview.22165.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fd1cb9959407923cec32295ebdb33931b6f38bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Mar 2022 09:54:10 +0000 Subject: [PATCH 10/10] Update dependencies from https://github.com/dotnet/sdk build 20220315.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.0.3-beta.22161.4 -> To Version 12.0.3-beta.22164.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce14fae35..764518b7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 2380b2f5181ea93893481406f0e37a2159202592 - + https://github.com/dotnet/sdk - 5f2d500e43184a2d173f3a0b4252384016c29eff + 5724adc5c3877bc0b837d9a0f7621b8756023118 - + https://github.com/dotnet/sdk - 5f2d500e43184a2d173f3a0b4252384016c29eff + 5724adc5c3877bc0b837d9a0f7621b8756023118 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fb76229895cae74c1adc62c2411a0730a2f3759b - + https://github.com/dotnet/fsharp - 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 + 13747851a1bdc5b4a34fcd1d45279a50638dbc82 - + https://github.com/dotnet/fsharp - 695d8c1e326fd7cfb7fa4c5c8d9c5559a7ef8a63 + 13747851a1bdc5b4a34fcd1d45279a50638dbc82 @@ -146,9 +146,9 @@ f3a5bad242b7a7b8149ae644de0a61c2f1bffc8d - + https://github.com/dotnet/msbuild - 9c173296404f9c365cc524569766f16d7cfcf308 + 08555986596aebc0701a1e1a0b4489b79b0e835a diff --git a/eng/Versions.props b/eng/Versions.props index 6201d7ee5..29653e4d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22165.1 - 6.0.300-preview.22165.1 + 6.0.300-preview.22165.4 + 6.0.300-preview.22165.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)