From d60088f4d5dfb6ec1490d66bf4b12a2c292734ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 15:46:40 +0000 Subject: [PATCH 01/28] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1 --- NuGet.config | 9 +++------ eng/Version.Details.xml | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 16f4f035a..509606940 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,21 @@ + + - - - @@ -45,14 +44,12 @@ + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ee2f70ff..0334ee0cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages - 2bd5e08a5ede56b51ea88ac3deecde19c5c520cb + 562275e0d453c753f4a887323e298419310f3849 From ca2b7c8cbecad874391d3a59bee4fd835d5d48fd Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 10 Mar 2022 00:19:52 +0000 Subject: [PATCH 02/28] Update source-build with 6.0.103 artifacts --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MsftToSbSdk.diff | 50 ++++++++----------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9207cb019..ea5efdaaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,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.2 + 6.0.103 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index c0ffde810..4947d6f9a 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.102" + "dotnet": "6.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 ec672a047..64668dfdc 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.linux-x64/ @@ -43,22 +29,18 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h -./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/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.bannana.rid/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/apphost -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/coreclr_delegates.h -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/hostfxr.h -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.a -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.so -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/nethost.h -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/singlefilehost ++./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/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/ ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/apphost ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/coreclr_delegates.h ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/hostfxr.h ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/libnethost.a ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/libnethost.so ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/nethost.h ++./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/singlefilehost ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ -764,6 +746,14 @@ index ------------ ./sdk/x.y.z/ref/mscorlib.dll ./sdk/x.y.z/ref/netstandard.dll @@ ------------ @@ + ./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/netcoreapp3.1/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/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.Runtime.CompilerServices.Unsafe.dll From 1be173704f1d3e7092e3d05a2bb8cdefdeeca61d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Mar 2022 21:35:31 -0600 Subject: [PATCH 03/28] Disable public source-build tarball ci (#13377) --- eng/source-build-tarball-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 18dbe8324..1f94b2448 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -4,7 +4,7 @@ resources: pipelines: - pipeline: installer-build-resource source: installer - trigger: true + trigger: false stages: - stage: build From d98038c498e08c03dae8ee925992ac39792b350e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 Mar 2022 08:32:51 -0600 Subject: [PATCH 04/28] Fix invalid pipeline trigger. --- eng/source-build-tarball-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 1f94b2448..da87d93cf 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -4,7 +4,7 @@ resources: pipelines: - pipeline: installer-build-resource source: installer - trigger: false + trigger: none stages: - stage: build From dc797288d4e3f48467949b97f56fbdbb9498216c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Mar 2022 15:34:40 +0000 Subject: [PATCH 05/28] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1 --- NuGet.config | 6 ------ eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 509606940..721fc0e1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -42,9 +39,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0334ee0cc..b853bce03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages - 562275e0d453c753f4a887323e298419310f3849 + 2125d910fc86ff6cd4f834d32f70f0290b31fd96 From 1d02c2b7747bbca63a1c2d4159af9c010609fb99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Mar 2022 18:30:46 +0000 Subject: [PATCH 06/28] Update dependencies from https://github.com/dotnet/arcade build 20220309.8 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.22159.8 --- eng/Version.Details.xml | 12 ++-- 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 +- 7 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b853bce03..1faff5422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 4f4c8c392d1c51e630f4571e39a095da7fb172c5 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 4f4c8c392d1c51e630f4571e39a095da7fb172c5 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 4f4c8c392d1c51e630f4571e39a095da7fb172c5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9207cb019..0e691499f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22122.7 + 6.0.0-beta.22159.8 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..4b8ebdbc7 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.22159.8", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22159.8" } } From 2c17f40ecf562eb34f1bdf819f9ea5be0f50d2d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 10 Mar 2022 14:03:12 -0800 Subject: [PATCH 07/28] Remove maui workloads from 6.0.100 The old workloads break MU so we either have to update them or remove them. --- src/redist/targets/BundledManifests.targets | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index b83c642f3..567650af5 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,11 +1,5 @@ - - - - - - From 290291a0da348b11593a521c6f0fb20e69638e1a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 17 Feb 2022 14:20:45 -0800 Subject: [PATCH 08/28] Only do signcheck if there are files to sign check --- src/redist/targets/BundledManifests.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 567650af5..3f8f9ea42 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -52,7 +52,8 @@ - Count())' != '0'" + Command="$(SignCheckExe) ^ --recursive ^ -f UnsignedFiles ^ -i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^ From 1b84fc233f2337cc598619a9b2834f70cdb1d760 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 11 Mar 2022 15:49:32 -0600 Subject: [PATCH 09/28] Remove template text-only packages which are alread included in source-build (#13380) --- src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index e49753264..50bf22938 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -11,9 +11,7 @@ should be added to source-build-reference-packages. --> - - From 6b3f3a8f02cb8387b42990eb6d44f58f9cbff84a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Mar 2022 00:40:30 +0000 Subject: [PATCH 10/28] Update dependencies from https://github.com/dotnet/arcade build 20220311.1 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1 --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 721fc0e1e..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1faff5422..36d8dda1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 4f4c8c392d1c51e630f4571e39a095da7fb172c5 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 4f4c8c392d1c51e630f4571e39a095da7fb172c5 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 4f4c8c392d1c51e630f4571e39a095da7fb172c5 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 704182b9a..6a0c76e05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22159.8 + 6.0.0-beta.22161.1 diff --git a/global.json b/global.json index 4b8ebdbc7..3778b80ba 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22159.8", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22159.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From a6c57692ab46a93067fcf38ac3c6a67f0178227a Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 11 Mar 2022 19:18:34 -0600 Subject: [PATCH 11/28] Update source-build MsftToSbSdk.diff baseline (#13400) --- .../assets/baselines/MsftToSbSdk.diff | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 64668dfdc..6418004c8 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,7 +14,21 @@ 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.linux-x64/ @@ -29,6 +43,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h -./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/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/ From cc5d04d869e975bb6d3c0b5ae0f16fc370d69e6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Mar 2022 02:56:09 +0000 Subject: [PATCH 12/28] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1 --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 721fc0e1e..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1faff5422..75af749b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 4f4c8c392d1c51e630f4571e39a095da7fb172c5 - + https://github.com/dotnet/source-build-reference-packages - 2125d910fc86ff6cd4f834d32f70f0290b31fd96 + a4550df3cb245c4dfd9601c67f86a27a88aad962 From 3ae21976739a8f0888898b56ac46d64e5beb4bf1 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 15 Mar 2022 09:22:56 -0700 Subject: [PATCH 13/28] [release/6.0.1xx] Windows SDK projection update --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 08821b070..0c141e3cb 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.23 - 10.0.18362.23 - 10.0.19041.23 - 10.0.20348.23 - 10.0.22000.23 + 10.0.17763.24 + 10.0.18362.24 + 10.0.19041.24 + 10.0.20348.24 + 10.0.22000.24 From bc714f97e9eeb9f6dd860781d15ae44b7d70981d Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 15 Mar 2022 11:00:38 -0700 Subject: [PATCH 14/28] [release/6.0.1xx] dotnet watch smoke test (#13392) * add dotnet watch smoke test --- .../DotNetHelper.cs | 29 +++++---- .../DotNetWatchTests.cs | 60 +++++++++++++++++++ .../ExecuteHelper.cs | 4 +- 3 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs 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 ba011b06c..7c263e080 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 @@ -79,14 +79,25 @@ internal class DotNetHelper } } - public void ExecuteCmd(string args, string? workingDirectory = null) + public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) { + Action configureProcess = (Process process, string? workingDirectory) => { + ConfigureProcess(process, workingDirectory); + + if (additionalProcessConfigCallback != null) + { + additionalProcessConfigCallback(process); + } + }; + (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, args, OutputHelper, - configure: (process) => ConfigureProcess(process, workingDirectory)); - ExecuteHelper.ValidateExitCode(executeResult); + configure: (process) => configureProcess(process, workingDirectory), + millisecondTimeout: millisecondTimeout); + + ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); } public static void ConfigureProcess(Process process, string? workingDirectory, bool setPath = false) @@ -170,18 +181,14 @@ internal class DotNetHelper public void ExecuteRunWeb(string projectName) { - (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( - DotNetPath, + ExecuteCmd( $"run {GetBinLogOption(projectName, "run")}", - OutputHelper, - configure: configureProcess, + GetProjectDirectory(projectName), + additionalProcessConfigCallback: processConfigCallback, millisecondTimeout: 30000); - ExecuteHelper.ValidateExitCode(executeResult); - void configureProcess(Process process) + void processConfigCallback(Process process) { - ConfigureProcess(process, GetProjectDirectory(projectName)); - process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => { if (e.Data?.Contains("Application started. Press Ctrl+C to shut down.") ?? false) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs new file mode 100644 index 000000000..183311037 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -0,0 +1,60 @@ +// Licensed to the .NET Foundation under one or more agreements. +// 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.Diagnostics; +using System.IO; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public class DotNetWatchTests : SmokeTests +{ + public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + + [Fact] + public void WatchTests() + { + string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); + bool outputChanged = false; + + // We expect an exit code of 143 (128 + 15, i.e. SIGTERM) because we are killing the process manually + DotNetHelper.ExecuteCmd( + "watch run", + workingDirectory: projectDirectory, + additionalProcessConfigCallback: processConfigCallback, + expectedExitCode: 143, + millisecondTimeout: 30000); + + Assert.True(outputChanged); + + void processConfigCallback(Process process) + { + const string waitingString = "Waiting for a file to change before restarting dotnet..."; + const string expectedString = "Hello from dotnet watch!"; + + bool fileChanged = false; + + process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => + { + if (e.Data?.Contains(waitingString) ?? false) + { + if (!fileChanged) { + OutputHelper.WriteLine("Program started, changing file on disk to trigger restart..."); + File.WriteAllText( + Path.Combine(projectDirectory, "Program.cs"), + File.ReadAllText(Path.Combine(projectDirectory, "Program.cs")).Replace("Hello, World!", expectedString)); + fileChanged = true; + } + } + else if (e.Data?.Contains(expectedString) ?? false) + { + outputChanged = true; + OutputHelper.WriteLine("Successfully re-ran program after code change."); + ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + } + }); + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 5c135b3fe..4a7b87750 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -84,9 +84,9 @@ internal static class ExecuteHelper return result.StdOut; } - public static void ValidateExitCode((Process Process, string StdOut, string StdErr) result) + public static void ValidateExitCode((Process Process, string StdOut, string StdErr) result, int expectedExitCode = 0) { - if (result.Process.ExitCode != 0) + if (result.Process.ExitCode != expectedExitCode) { ProcessStartInfo startInfo = result.Process.StartInfo; string msg = $"Failed to execute {startInfo.FileName} {startInfo.Arguments}" + From fe2e9b9fb86418fb25c508825be8101f1b7e1986 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 10:48:26 -0500 Subject: [PATCH 15/28] Fix issue with BundledTemplates condition --- src/redist/targets/BundledTemplates.targets | 173 ++++++++++---------- 1 file changed, 86 insertions(+), 87 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b1896eb09..371148c02 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,94 +20,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) + + + From aff4e2553e8f9fba2dfb60d8b8db866cacfe4a59 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 12:38:23 -0500 Subject: [PATCH 16/28] Make a source-build targetted fix to unblock release --- src/redist/targets/BundledTemplates.targets | 173 ++++++++++---------- 1 file changed, 87 insertions(+), 86 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 371148c02..30f47ce59 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,93 +20,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) - - - From 64addbe5bf19ad47150cb10e8117cb1a11fa3577 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 10:48:26 -0500 Subject: [PATCH 17/28] Fix issue with BundledTemplates condition --- src/redist/targets/BundledTemplates.targets | 173 ++++++++++---------- 1 file changed, 86 insertions(+), 87 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b1896eb09..371148c02 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,94 +20,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) + + + From 57292e300ccb59d7512f54d5402747c4b40336c5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 17 Mar 2022 12:38:23 -0500 Subject: [PATCH 18/28] Make a source-build targetted fix to unblock release --- src/redist/targets/BundledTemplates.targets | 173 ++++++++++---------- 1 file changed, 87 insertions(+), 86 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 371148c02..30f47ce59 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -20,93 +20,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower()) - - - From 46c2e6ddf79ed1ad0885cbc3bdc0e9b6c75a6ffc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 21 Mar 2022 08:13:23 -0500 Subject: [PATCH 19/28] Refactor build.sh to optimize PackageVersions.props retrieval (#13443) --- src/SourceBuild/tarball/content/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 8cca086c3..01bf9dedb 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -114,14 +114,14 @@ restoredPackagesDir="$SCRIPT_ROOT/packages/restored" if [ -d "$SCRIPT_ROOT/packages/archive" ]; then sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` - if [ -f "$sourceBuiltArchive" ]; then + if [ -f "$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props" ]; then + packageVersionsPath=$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props + elif [ -f "$sourceBuiltArchive" ]; then tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props packageVersionsPath=/tmp/PackageVersions.props fi -else - if [ -f "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" ]; then - packageVersionsPath="$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" - fi +elif [ -f "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" ]; then + packageVersionsPath="$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" fi if [ ! -f "$packageVersionsPath" ]; then From a9d43d1d3d2b1c52e3de37375b2fb3f1e011627d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 23 Mar 2022 12:24:28 -0500 Subject: [PATCH 20/28] Update NuGet path issue in Run Tests CI step (#13453) --- .../eng/common/templates/steps/source-build-build-tarball.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index e76a80dc3..778c4634f 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -87,8 +87,8 @@ steps: set -x # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config - cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config + rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}}" From 211912bd41589993a7421fd0d429daa604f0f9bc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 23 Mar 2022 12:25:05 -0500 Subject: [PATCH 21/28] Refactor SdkContentTests to warn on diffs when run in CI (#13432) --- .../steps/source-build-build-tarball.yml | 4 ++-- src/SourceBuild/tarball/content/build.proj | 4 +++- .../BaselineHelper.cs | 20 ++++++++++++++----- .../Config.cs | 3 +++ .../SdkContentTests.cs | 4 ++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index 778c4634f..1cec502ab 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -91,7 +91,7 @@ steps: cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" - dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}}" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" if [[ '${{ parameters.isBootstrapped }}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" @@ -99,7 +99,7 @@ steps: dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi - docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} -- /p:SmokeTestConsoleVerbosity=detailed displayName: Run Tests # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index fffc76ce7..c9310fa6c 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -93,9 +93,11 @@ %(SdkTarballItem.Identity) + normal - + - [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.MsftSdkTarballPathEnv }, skipOnNullOrWhiteSpace: true)] + [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpace: true)] public void CompareMsftToSb() { const string msftFileListingFileName = "msftSdkFiles.txt"; @@ -34,7 +34,7 @@ public class SdkContentTests : SmokeTests diff = RemoveVersionedPaths(diff); diff = RemoveDiffMarkers(diff); diff = RemoveRids(diff); - BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper); + BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } private void WriteTarballFileList(string? tarballPath, string outputFileName) From 50f7e4f570c61b00dd2d5fd8912a74852cb1e42c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 08:21:22 -0700 Subject: [PATCH 22/28] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13488) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22161.1 -> To Version 6.0.0-servicing.22179.1 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 9930299ff..905170bbb 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 - a4550df3cb245c4dfd9601c67f86a27a88aad962 + dfdfa4ee297fe8daa90cd623c5b612abf3f60873 From 3080cd3c137b1d2fe7f00c350be9fc00ef2ef9db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 19:56:56 +0000 Subject: [PATCH 23/28] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13486) [release/6.0.1xx] 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 dfb68c294..a241e63d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - a4550df3cb245c4dfd9601c67f86a27a88aad962 + dfdfa4ee297fe8daa90cd623c5b612abf3f60873 From f6e3766b7adfac2863e91ba6453912d24d0fbd9e Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 31 Mar 2022 19:12:59 -0500 Subject: [PATCH 24/28] Add source-build leak detection (#13434) --- .../job/source-build-run-tarball-build.yml | 9 +- .../steps/source-build-build-tarball.yml | 21 +- src/SourceBuild/tarball/content/build.proj | 7 +- src/SourceBuild/tarball/content/build.sh | 4 + .../BaselineHelper.cs | 30 +- .../Config.cs | 5 + .../DotNetFormatTests.cs | 14 +- .../PoisonTests.cs | 34 + .../SdkContentTests.cs | 22 +- .../FormatTestFormatted.cs} | 0 .../assets/baselines/MsftToSbSdk.diff | 196 +-- .../assets/baselines/PoisonUsage.txt | 1328 +++++++++++++++++ .../content/tools-local/init-build.proj | 35 +- .../CheckForPoison.cs | 6 +- ...Net.SourceBuild.Tasks.LeakDetection.csproj | 6 +- 15 files changed, 1569 insertions(+), 148 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/{FormatTestExpectedFormatted.cs => baselines/FormatTestFormatted.cs} (100%) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt 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 b04465727..b6fd560d6 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 @@ -43,6 +43,7 @@ jobs: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false _ExcludeOmniSharpTests: true _Platform: linux _RunOnline: true @@ -50,6 +51,7 @@ jobs: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false _ExcludeOmniSharpTests: true _Platform: linux _RunOnline: false @@ -58,6 +60,7 @@ jobs: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS8Container }} + _EnablePoison: false _ExcludeOmniSharpTests: false _Platform: linux _RunOnline: false @@ -65,6 +68,7 @@ jobs: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false _ExcludeOmniSharpTests: false _Platform: linux _RunOnline: false @@ -72,6 +76,7 @@ jobs: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} + _EnablePoison: true _ExcludeOmniSharpTests: false _Platform: linux _RunOnline: false @@ -79,6 +84,7 @@ jobs: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.ubuntu1804Container }} + _EnablePoison: false _ExcludeOmniSharpTests: false _Platform: linux _RunOnline: false @@ -97,6 +103,7 @@ jobs: parameters: buildArch: $(_BuildArch) container: $(_Container) + enablePoison: $(_EnablePoison) excludeOmniSharpTests: $(_ExcludeOmniSharpTests) installerBuildResourceId: ${{ parameters.installerBuildResourceId }} platform: $(_Platform) @@ -104,7 +111,7 @@ jobs: set -x customPrepArgs= - if [ '$(_BootstrapPrep)' = 'true' ]; then + if [[ '$(_BootstrapPrep)' == 'true' ]]; then customPrepArgs='--bootstrap' fi diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index 1cec502ab..99e54f4ab 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -10,6 +10,9 @@ parameters: # Container image to build within container: null + # Enable the poison report + enablePoison: false + # Skip running the OmniSharp smoke-tests excludeOmniSharpTests: false @@ -26,7 +29,7 @@ parameters: prepScript: null # Whether or not to build online - runOnline: null + runOnline: false # Directory to build the tarball in tarballDir: @@ -55,7 +58,7 @@ steps: set -x resourceIdPathSegment= - if [ '${{ parameters.installerBuildResourceId }}' != 'current' ]; then + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' fi @@ -74,12 +77,16 @@ steps: networkArgs= customBuildArgs= - if [ '${{ parameters.runOnline}}' = 'true' ]; then + if [[ '${{ parameters.runOnline }}' == 'true' ]]; then customBuildArgs='--online' else networkArgs='--network none' fi + if [[ '${{ parameters.enablePoison }}' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${networkArgs} ${{ parameters.container }} ./build.sh ${customBuildArgs} ${{ parameters.additionalBuildArgs }} -- /p:CleanWhileBuilding=true displayName: Build Tarball @@ -92,6 +99,7 @@ steps: dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' if [[ '${{ parameters.isBootstrapped }}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" @@ -99,7 +107,12 @@ steps: dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi - docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} -- /p:SmokeTestConsoleVerbosity=detailed + if [[ '${{ parameters.enablePoison }}' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh $poisonArg --run-smoke-test ${{ parameters.additionalBuildArgs }} -- /p:SmokeTestConsoleVerbosity=detailed displayName: Run Tests # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index c9310fa6c..4c76732f7 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -68,12 +68,16 @@ + + + + + SMOKE_TESTS_POISON_REPORT_PATH=$(PoisonUsageReportFile); %(SdkTarballItem.Identity) normal @@ -101,7 +106,7 @@ EnvironmentVariables=" SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath); SMOKE_TESTS_TARGET_RID=$(TargetRid); - " /> + $(CustomTestEnvVars)" /> use the specified directory of previously-built packages" echo " --with-sdk use the SDK in the specified directory for bootstrapping" + echo " --poison build with poisoning checks" echo " --run-smoke-test don't build; run smoke tests" echo "use -- to send the remaining arguments to MSBuild" echo "" @@ -35,6 +36,9 @@ while :; do --online) MSBUILD_ARGUMENTS+=( "/p:BuildWithOnlineSources=true") ;; + --poison) + MSBUILD_ARGUMENTS+=( "/p:EnablePoison=true") + ;; --with-packages) CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR="$(cd -P "$2" && pwd)" if [ ! -d "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ]; then diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index 39d7bd389..abcf4dba9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using Xunit; using Xunit.Abstractions; @@ -36,18 +37,17 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests public static void CompareContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper, bool warnOnDiffs = false) { - string baselineFilePath = GetBaselineFilePath(baselineFileName); - string actualFilePath = Path.Combine(Environment.CurrentDirectory, $"{baselineFileName}"); File.WriteAllText(actualFilePath, actualContents); - CompareFiles(baselineFilePath, actualFilePath, outputHelper, warnOnDiffs); + CompareFiles(baselineFileName, actualFilePath, outputHelper, warnOnDiffs); } - public static void CompareFiles(string baselineFilePath, string actualFilePath, ITestOutputHelper outputHelper, bool warnOnDiffs = false) + public static void CompareFiles(string baselineFileName, string actualFilePath, ITestOutputHelper outputHelper, bool warnOnDiffs = false) { - string baselineFileText = File.ReadAllText(baselineFilePath); - string actualFileText = File.ReadAllText(actualFilePath); + string baselineFilePath = GetBaselineFilePath(baselineFileName); + string baselineFileText = File.ReadAllText(baselineFilePath).Trim(); + string actualFileText = File.ReadAllText(actualFilePath).Trim(); string? message = null; @@ -84,5 +84,23 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests public static string GetAssetsDirectory() => Path.Combine(Directory.GetCurrentDirectory(), "assets"); private static string GetBaselineFilePath(string baselineFileName) => Path.Combine(GetAssetsDirectory(), "baselines", baselineFileName); + + public static string RemoveRids(string diff) => diff.Replace(Config.TargetRid, "banana.rid"); + + public static string RemoveVersions(string source) + { + // Remove semantic versions + // Regex source: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string + Regex semanticVersionRegex = new( + $"(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)" + + $"(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))" + + $"?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?"); + string result = semanticVersionRegex.Replace(source, $"x.y.z"); + + // Remove netx.y path segments + string pathSeparator = Regex.Escape(Path.DirectorySeparatorChar.ToString()); + Regex netTfmRegex = new($"{pathSeparator}net[1-9]+\\.[0-9]+{pathSeparator}"); + return netTfmRegex.Replace(result, $"{Path.DirectorySeparatorChar}netx.y{Path.DirectorySeparatorChar}"); + } } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index 9abf0c299..0aaab59ff 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -12,18 +12,23 @@ internal static class Config public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR"; public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP"; public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH"; + public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH"; public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH"; public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID"; + public const string WarnPoisonDiffsEnv = "SMOKE_TESTS_WARN_POISON_DIFFS"; public const string WarnSdkContentDiffsEnv = "SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS"; public static string DotNetDirectory { get; } = Environment.GetEnvironmentVariable(DotNetDirectoryEnv) ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); public static string? MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv); + public static string? PoisonReportPath { get; } = Environment.GetEnvironmentVariable(PoisonReportPathEnv); public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv); public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); + public static bool WarnOnPoisonDiffs { get; } = + bool.TryParse(Environment.GetEnvironmentVariable(WarnPoisonDiffsEnv), out bool excludeOnlineTests) && excludeOnlineTests; public static bool WarnOnSdkContentDiffs { get; } = bool.TryParse(Environment.GetEnvironmentVariable(WarnSdkContentDiffsEnv), out bool excludeOnlineTests) && excludeOnlineTests; } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs index cad0d30d4..d6ec47734 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs @@ -10,8 +10,9 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; public class DotNetFormatTests : SmokeTests { + private const string TestFileName = "FormatTest.cs"; private const string UnformattedFileName = "FormatTestUnformatted.cs"; - private const string ExpectedFormattedFileName = "FormatTestExpectedFormatted.cs"; + private const string ExpectedFormattedFileName = "FormatTestFormatted.cs"; public DotNetFormatTests(ITestOutputHelper outputHelper) : base(outputHelper) { } @@ -21,20 +22,17 @@ public class DotNetFormatTests : SmokeTests [Fact] public void FormatProject() { - string assetsDirectory = BaselineHelper.GetAssetsDirectory(); - - string unformattedCsFilePath = Path.Combine(assetsDirectory, UnformattedFileName); - string expectedFormattedCsFilePath = Path.Combine(assetsDirectory, ExpectedFormattedFileName); + string unformattedCsFilePath = Path.Combine(BaselineHelper.GetAssetsDirectory(), UnformattedFileName); string projectDirectory = DotNetHelper.ExecuteNew("console", nameof(FormatProject), "C#"); string projectFilePath = Path.Combine(projectDirectory, nameof(FormatProject) + ".csproj"); - string formattedCsFilePath = Path.Combine(projectDirectory, UnformattedFileName); + string testFilePath = Path.Combine(projectDirectory, TestFileName); - File.Copy(unformattedCsFilePath, formattedCsFilePath); + File.Copy(unformattedCsFilePath, testFilePath); DotNetHelper.ExecuteCmd($"format {projectFilePath}"); - BaselineHelper.CompareFiles(expectedFormattedCsFilePath, formattedCsFilePath, OutputHelper); + BaselineHelper.CompareFiles(ExpectedFormattedFileName, testFilePath, OutputHelper); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs new file mode 100644 index 000000000..11ea0667f --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs @@ -0,0 +1,34 @@ +// Licensed to the .NET Foundation under one or more agreements. +// 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; +using System.IO; +using System.Text.RegularExpressions; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests +{ + public class PoisonTests : SmokeTests + { + public PoisonTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + + [SkippableFact(Config.PoisonReportPathEnv, skipOnNullOrWhiteSpace: true)] + public void VerifyUsage() + { + if (!File.Exists(Config.PoisonReportPath)) + { + throw new InvalidOperationException($"Poison report '{Config.PoisonReportPath}' does not exist."); + } + + string currentPoisonReport = File.ReadAllText(Config.PoisonReportPath); + currentPoisonReport = RemoveHashes(currentPoisonReport); + currentPoisonReport = BaselineHelper.RemoveRids(currentPoisonReport); + currentPoisonReport = BaselineHelper.RemoveVersions(currentPoisonReport); + + BaselineHelper.CompareContents("PoisonUsage.txt", currentPoisonReport, OutputHelper, Config.WarnOnPoisonDiffs); + } + + private static string RemoveHashes(string source) => Regex.Replace(source, "^\\s*.*(\r\n?|\n)", string.Empty, RegexOptions.Multiline); + } +} 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 74657726c..2ca4b03a4 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 @@ -31,9 +31,9 @@ public class SdkContentTests : SmokeTests WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName); string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); - diff = RemoveVersionedPaths(diff); + diff = BaselineHelper.RemoveVersions(diff); diff = RemoveDiffMarkers(diff); - diff = RemoveRids(diff); + diff = BaselineHelper.RemoveRids(diff); BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); } @@ -57,22 +57,4 @@ public class SdkContentTests : SmokeTests Regex diffSegmentRegex = new("^@@ .* @@", RegexOptions.Multiline); return diffSegmentRegex.Replace(result, "@@ ------------ @@"); } - - private static string RemoveRids(string diff) => diff.Replace(Config.TargetRid, "banana.rid"); - - private static string RemoveVersionedPaths(string source) - { - // Remove semantic version path segments - string pathSeparator = Regex.Escape(Path.DirectorySeparatorChar.ToString()); - // Regex source: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string - Regex semanticVersionRegex = new( - $"{pathSeparator}(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)" - + $"(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))" - + $"?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?{pathSeparator}"); - string result = semanticVersionRegex.Replace(source, $"{Path.DirectorySeparatorChar}x.y.z{Path.DirectorySeparatorChar}"); - - // Remove net.x.y path segments - Regex netTfmRegex = new($"{pathSeparator}net[1-9]*.[0-9]{pathSeparator}"); - return netTfmRegex.Replace(result, $"{Path.DirectorySeparatorChar}netx.y{Path.DirectorySeparatorChar}"); - } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestExpectedFormatted.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestExpectedFormatted.cs rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/FormatTestFormatted.cs 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 6418004c8..f1600a4aa 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 @@ -860,65 +860,65 @@ index ------------ ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.props ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.targets ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/ -+./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/microsoft.docker.sdk.1.1.0.csproj ++./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/microsoft.docker.sdk.x.y.z.csproj ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/ ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.props ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.targets @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Runtime.CompilerServices.Unsafe.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.Publish/targets/TransformTargets/Transforms/EnvironmentNoLocation.transform ./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/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.Publish/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Bcl.AsyncInterfaces.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll.config --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Delegation.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.Tracing.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.XmlTransform.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Buffers.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Encodings.Web.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Json.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Threading.Tasks.Extensions.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.ValueTuple.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./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 @@ -934,13 +934,13 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Text.Encodings.Web.dll + ./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 +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll @@ -972,40 +972,40 @@ index ------------ -./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/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.Collections.Immutable.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.Metadata.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/System.Runtime.CompilerServices.Unsafe.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/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 @@ -1041,13 +1041,13 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Reflection.Metadata.dll + ./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 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 new file mode 100644 index 000000000..25f79024b --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -0,0 +1,1328 @@ + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 1070cf0be..701f76c0c 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -14,14 +14,15 @@ - - $(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) + + $(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)%3B$(PrebuiltSourceBuiltPackagesPath) + + tasks\Microsoft.DotNet.SourceBuild.Tasks.XPlat\Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj;tasks\SourceBuild.MSBuildSdkResolver\SourceBuild.MSBuildSdkResolver.csproj + + + + tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj + + + + + + @@ -185,10 +206,14 @@ + + + + diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs index 3fad37c47..d3c683c56 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs @@ -134,7 +134,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection // if we should write out the poison report, do that if (!string.IsNullOrWhiteSpace(PoisonReportOutputFilePath)) { - File.WriteAllText(PoisonReportOutputFilePath, (new XElement("PrebuiltLeakReport", poisons.Select(p => p.ToXml()))).ToString()); + File.WriteAllText(PoisonReportOutputFilePath, (new XElement("PrebuiltLeakReport", poisons.OrderBy(p => p.Path).Select(p => p.ToXml()))).ToString()); } if (FailOnPoisonFound && poisons.Count() > 0) @@ -167,8 +167,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection IEnumerable catalogedPackages = ReadCatalog(catalogedPackagesFilePath); var poisons = new List(); var candidateQueue = new Queue(initialCandidates); - // avoid collisions between nupkgs with the same name - var dirCounter = 0; if (!string.IsNullOrWhiteSpace(OverrideTempPath)) { Directory.CreateDirectory(OverrideTempPath); @@ -184,7 +182,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection // add its contents to the list to be checked. if (ZipFileExtensions.Concat(TarFileExtensions).Concat(TarGzFileExtensions).Any(e => checking.ToLowerInvariant().EndsWith(e))) { - var tempCheckingDir = Path.Combine(tempDir.FullName, Path.GetRandomFileName(), Path.GetFileNameWithoutExtension(checking) + "." + (++dirCounter).ToString()); + var tempCheckingDir = Path.Combine(tempDir.FullName, Path.GetFileNameWithoutExtension(checking)); PoisonedFileEntry result = ExtractAndCheckZipFileOnly(catalogedPackages, checking, markerFileName, tempCheckingDir, candidateQueue); if (result != null) { diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj index b9eefcd65..c00725cc7 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -1,7 +1,7 @@  - netcoreapp6.0 + net6.0 true $(LeakDetectionTasksBinDir) @@ -26,4 +26,8 @@ + + + + From bbbdd190c3f2f84517bad309634f3c91e20f1407 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 31 Mar 2022 22:53:54 -0700 Subject: [PATCH 25/28] Revert the version.details.xml file --- 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 a241e63d7..dfb68c294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/source-build-reference-packages - dfdfa4ee297fe8daa90cd623c5b612abf3f60873 + a4550df3cb245c4dfd9601c67f86a27a88aad962 From 5599709ad41d711f5a094a901ac10bc6e686c044 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 21:12:36 +0000 Subject: [PATCH 26/28] Update dependencies from https://github.com/dotnet/sdk build 20220401.6 (#13525) [release/6.0.3xx] Update dependencies from dotnet/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 1c052db2b..9af00e2f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating b0eac7f0c4a40316aa4e5004e597e217035cbcc9 - + https://github.com/dotnet/sdk - b546656d52d6221f78e51172f4feac68c46c51b7 + 9dc5b2e62e113d121235d80e9cfd8336d2eb335a - + https://github.com/dotnet/sdk - b546656d52d6221f78e51172f4feac68c46c51b7 + 9dc5b2e62e113d121235d80e9cfd8336d2eb335a diff --git a/eng/Versions.props b/eng/Versions.props index 32d7c17e5..9cd0227a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22201.4 - 6.0.300-preview.22201.4 + 6.0.300-preview.22201.6 + 6.0.300-preview.22201.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f23310c97de1ef680d1093ce0f32f40a23f6c76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 20:21:46 -0700 Subject: [PATCH 27/28] [release/6.0.3xx] Update dependencies from dotnet/sdk (#13528) * Update dependencies from https://github.com/dotnet/sdk build 20220404.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22201.6 -> To Version 6.0.300-preview.22204.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 6.0.300-preview.22180.3 -> To Version 6.0.300-preview.22201.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220404.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22201.6 -> To Version 6.0.300-preview.22204.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 6.0.300-preview.22180.3 -> To Version 6.0.300-preview.22201.5 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9af00e2f8..2b00cee5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - b0eac7f0c4a40316aa4e5004e597e217035cbcc9 + 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/templating - b0eac7f0c4a40316aa4e5004e597e217035cbcc9 + 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/templating - b0eac7f0c4a40316aa4e5004e597e217035cbcc9 + 5ad577ee814db3c7473d904888c7db31129cf435 - + https://github.com/dotnet/sdk - 9dc5b2e62e113d121235d80e9cfd8336d2eb335a + 3c2c2e186f91025bc78ded47b35ddf3b765ee43e - + https://github.com/dotnet/sdk - 9dc5b2e62e113d121235d80e9cfd8336d2eb335a + 3c2c2e186f91025bc78ded47b35ddf3b765ee43e @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a59a22c6f3c2cc1883e20cece412209f18f4a29f + 4f4a757510f260eb8ac121dd9f8e7706d13751fb @@ -151,9 +151,9 @@ ce7523296d7ddb70fb61a68e84bc2ff38e012e35 - + https://github.com/nuget/nuget.client - bc4b41f3ca294ccc8aedc8af5159c215943e1ed2 + 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab diff --git a/eng/Versions.props b/eng/Versions.props index 9cd0227a2..ec440eb5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.300-preview.22180.3 + 6.0.300-preview.22201.5 @@ -56,8 +56,8 @@ - 6.0.300-preview.22201.6 - 6.0.300-preview.22201.6 + 6.0.300-preview.22204.3 + 6.0.300-preview.22204.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.300-preview.22180.3 + 6.0.300-preview.22201.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From e0053fd69a309e657a86e617b0922c6dc55a2617 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Apr 2022 20:33:34 +0000 Subject: [PATCH 28/28] Update dependencies from https://github.com/dotnet/arcade build 20220328.5 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/source-build.yml | 4 ++-- global.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b00cee5d..95c591503 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ec440eb5b..980b7746f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22161.1 + 6.0.0-beta.22178.5 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 3778b80ba..b5bee2e33 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" } }