From da0c529d9835e83a0357856d728f4be49d3fa377 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 19:09:51 +0000 Subject: [PATCH 1/4] [main] Update dependencies from dotnet/sdk (#19216) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 44 +++++++++---------- eng/Versions.props | 18 ++++---- .../templates/variables/vmr-build.yml | 4 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c78ca1cf1..6e962a714 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - c805f1d0fd42909046af661edb02bcf1428ff304 + e9216a8057d1837fc2344fa36703ae8f9b49cc24 - + https://github.com/dotnet/windowsdesktop - c805f1d0fd42909046af661edb02bcf1428ff304 + e9216a8057d1837fc2344fa36703ae8f9b49cc24 - + https://github.com/dotnet/windowsdesktop - c805f1d0fd42909046af661edb02bcf1428ff304 + e9216a8057d1837fc2344fa36703ae8f9b49cc24 - + https://github.com/dotnet/windowsdesktop - c805f1d0fd42909046af661edb02bcf1428ff304 + e9216a8057d1837fc2344fa36703ae8f9b49cc24 https://github.com/dotnet/runtime @@ -91,26 +91,26 @@ 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/sdk - 1d212f88bd92e3257fea744aba7199f872ee4989 + f4c11814251c66b510761dee510b9b16c956fe50 - + https://github.com/dotnet/sdk - 1d212f88bd92e3257fea744aba7199f872ee4989 + f4c11814251c66b510761dee510b9b16c956fe50 - + https://github.com/dotnet/sdk - 1d212f88bd92e3257fea744aba7199f872ee4989 + f4c11814251c66b510761dee510b9b16c956fe50 - + https://github.com/dotnet/sdk - 1d212f88bd92e3257fea744aba7199f872ee4989 + f4c11814251c66b510761dee510b9b16c956fe50 - + https://github.com/dotnet/sdk - 1d212f88bd92e3257fea744aba7199f872ee4989 + f4c11814251c66b510761dee510b9b16c956fe50 @@ -144,13 +144,13 @@ - + https://github.com/dotnet/winforms - e59c8abcf6e29b8b99a2efefec4133b1f94559af + 9c9b2e06a998f65638053fdd32cbd65c4cd1a64f - + https://github.com/dotnet/wpf - 6ffdf5ca7bdc28496c8b5533277705fba66483f4 + 9ef9cfb01e493f617202fd47a09c3403327933a4 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9ac1812a6..0f5e03034 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24168.11 + 9.0.0-preview.4.24176.1 - 9.0.0-preview.3.24168.12 + 9.0.0-preview.4.24177.1 @@ -80,9 +80,9 @@ - 9.0.100-preview.4.24177.2 - 9.0.100-preview.4.24177.2 - 9.0.100-preview.4.24177.2 + 9.0.100-preview.4.24177.10 + 9.0.100-preview.4.24177.10 + 9.0.100-preview.4.24177.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -106,10 +106,10 @@ - 9.0.0-preview.4.24176.1 - 9.0.0-preview.4.24176.1 - 9.0.0-preview.4.24176.1 - 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.1 diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 656e928a0..65db5a955 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -45,7 +45,7 @@ variables: - name: poolImage_Mac value: macos-12 - name: poolImage_Windows - value: windows.vs2022.amd64.open + value: windows.vs2022preview.amd64.open - ${{ else }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - name: defaultPoolName @@ -62,4 +62,4 @@ variables: - name: poolImage_Mac value: macos-13-arm64 - name: poolImage_Windows - value: windows.vs2022.amd64 + value: windows.vs2022preview.amd64 From 830e02f93cb86b73997de91d14160df023419542 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:39:18 -0700 Subject: [PATCH 2/4] Cloak Non-OSS licensed Winforms test (#19218) --- .../assets/LicenseExclusions.txt | 7 ------- src/VirtualMonoRepo/source-mappings.json | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt index edbf642f0..f2f5e9e9c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt @@ -274,13 +274,6 @@ src/vstest/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgs src/vstest/src/package/Microsoft.CodeCoverage/ThirdPartyNoticesCodeCoverage.txt src/vstest/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf -# -# winforms -# - -# ISSUE: Winforms repo bringing in a non-open source license (https://github.com/dotnet/source-build/issues/3772) -src/winforms/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/LICENSE.txt - # # wpf # diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index c6a44e0a3..b1cf306d4 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -186,7 +186,11 @@ }, { "name": "winforms", - "defaultRemote": "https://github.com/dotnet/winforms" + "defaultRemote": "https://github.com/dotnet/winforms", + "exclude": [ + // Non-OSS license - https://github.com/dotnet/source-build/issues/3772 + "src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/**" + ] }, { "name": "wpf", From ac65bb3e0cb602c82b80fa20f71a9360c0d56e12 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:56:34 -0700 Subject: [PATCH 3/4] Scan binaries for licenses (#19206) --- .../LicenseScanTests.cs | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 08951438b..4cab87bc8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -107,31 +107,7 @@ public class LicenseScanTests : TestBase private static readonly string[] s_ignoredFilePatterns = new string[] { - "*.bin", - "*.bmp", - "*.bson", - "*.db", - "*.dic", - "*.eot", - "*.gif", - "*.ico", - "*.jpg", - "*.il", "*.ildump", - "*.lss", - "*.nlp", - "*.otf", - "*.pdf", - "*.pfx", - "*.png", - "*.snk", - "*.ttf", - "*.vsd", - "*.vsdx", - "*.winmd", - "*.woff", - "*.woff2", - "*.xlsx", }; private readonly string _targetRepo; From afab34fd84b5bdbaa605548068caf86b231d1e5c Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:01:43 -0700 Subject: [PATCH 4/4] Cloak Non-OSS licensed vstest binary (#19219) --- src/VirtualMonoRepo/source-mappings.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index b1cf306d4..b77e4dfcd 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -167,7 +167,9 @@ "defaultRemote": "https://github.com/microsoft/vstest", "exclude": [ // Non-OSS license used in VS specific build configurations. - "src/package/licenses/LICENSE_VS.txt" + // Non-OSS license - https://github.com/dotnet/source-build/issues/4255 + "src/package/licenses/LICENSE_VS.txt", + "test/Microsoft.TestPlatform.CoreUtilities.UnitTests/TestAssets/dotnetWinX86.exe" ] }, {