Merge remote-tracking branch 'origin/main' into marcpopMSFT-portpackageschange

marcpopMSFT · marcpopMSFT · commit daf06157bc55 · 2024-07-08T10:24:56.000-07:00
diff --git a/.devcontainer/vmr/README.md b/.devcontainer/vmr/README.md
@@ -8,19 +8,25 @@
 ##     ## ######## ##     ## ########        ##    ##     ## ####  ######
 -->
 
-This Codespace can help you debug the source build of .NET. In case you have run this from a
-`dotnet/sdk` PR branch, it will contain the VMR (`dotnet/dotnet`) checked out into
-`/workspaces/dotnet` with the PR changes pulled into it. You can then attempt to source-build
-the VMR which is what the VMR leg in the sdk PR build doing. This build takes about 45
-minutes and, after completion, produces an archived .NET SDK located in
+This Codespace allows you to debug or make changes to the .NET SDK product. In case you ran this
+from a `dotnet/sdk` PR branch, the directory tree contains the VMR (`dotnet/dotnet`) checked out into
+`/workspaces/dotnet` with the PR changes pulled into it. Building the VMR from the codespace mimics
+what the VMR pipelines in an sdk PR are doing. The build takes about 45-75 minutes
+(depending on the machine spec and target OS) and, after completion, produces an archived .NET SDK located in
 `/workspaces/dotnet/artifacts/assets/Release`.
 
 ## Build the SDK
 
-To build the VMR, run following:
+To build the repository, run one of the following:
 ```bash
-cd /workspaces/dotnet
-./build.sh --online
+# Microsoft based build
+./build.sh
+```
+or
+
+```bash
+# Building from source only
+./prep-source-build.sh && ./build.sh -sb
 ```
 
 > Please note that, at this time, the build modifies some of the checked-in sources so it might
diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml
@@ -0,0 +1,13 @@
+name: Inter-branch merge workflow
+on:
+  push:
+    branches:
+      - release/**
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
diff --git a/documentation/project-docs/developer-guide.md b/documentation/project-docs/developer-guide.md
@@ -113,6 +113,8 @@ Run the following commands from the root of the repository to setup the test env
 source ./eng/dogfood.sh
 ```
 
+NOTE: If you are running on MacOS you will need to use a `bash` shell rather than the default `zsh`. You can either change your default shell or type `bash` before executing the above command.
+
 Ensure the `dotnet` being used is from the artifacts directory:
 
 ```
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj
@@ -39,6 +39,7 @@
     <TieredCompilationQuickJitForLoops>true</TieredCompilationQuickJitForLoops>
     <TieredPGO>true</TieredPGO>
     <StartupHookSupport>false</StartupHookSupport>
+    <StackTraceSupport>false</StackTraceSupport>
     <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
     <AutoreleasePoolSupport>false</AutoreleasePoolSupport>
     <ThreadPoolMinThreads>2</ThreadPoolMinThreads>
diff --git a/src/Cli/dotnet/Installer/Windows/Security/Signature.cs b/src/Cli/dotnet/Installer/Windows/Security/Signature.cs
@@ -30,7 +30,9 @@ internal static class Signature
         internal static unsafe int HasMicrosoftTrustedRoot(string path)
         {
             // Create an X509Certificate2 instance so we can access the certificate context and create a chain context.
+#pragma warning disable SYSLIB0057 // can't use X509CertificateLoader here since it tries to parse the file as a certificate
             using X509Certificate2 certificate = new(path);
+#pragma warning restore SYSLIB0057
 
             // We don't use X509Chain because it doesn't support verifying the specific policy and because we defer
             // that to the WinTrust provider as it performs timestamp and revocation checks.
diff --git a/src/SourceBuild/content/.devcontainer/README.md b/src/SourceBuild/content/.devcontainer/README.md
@@ -8,10 +8,12 @@
 ##     ## ######## ##     ## ########        ##    ##     ## ####  ######
 -->
 
-This Codespace can help you debug the source build of .NET. This build takes about
-45 minutes and, after completion, produces an archived .NET SDK located in
-`/workspaces/dotnet/artifacts/assets/Release`. In case you selected the `prebuilt-sdk`
-Codespace, the built-from-source SDK will already be there.
+This Codespace allows you to debug or make changes to the .NET SDK product. The build takes about
+45 up to 75 minutes (depending on the machine and OS) and, after completion, produces an archived
+.NET SDK located in `/workspaces/dotnet/artifacts/assets/Release`.
+
+In case you selected the prebuilt-sdk Codespace configuration (which is only useful when building
+from source), the built-from-source SDK will already be there.
 
 ## Build the SDK
 
diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml
@@ -2,9 +2,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319</Sha>
+      <Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
@@ -23,8 +23,8 @@
       of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
       are not necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSdkVersion>9.0.100-preview.6.24312.1</PrivateSourceBuiltSdkVersion>
-    <PrivateSourceBuiltArtifactsVersion>9.0.100-preview.6.24312.1</PrivateSourceBuiltArtifactsVersion>
+    <PrivateSourceBuiltSdkVersion>9.0.100-preview.7.24357.1</PrivateSourceBuiltSdkVersion>
+    <PrivateSourceBuiltArtifactsVersion>9.0.100-preview.7.24357.1</PrivateSourceBuiltArtifactsVersion>
     <!-- command-line-api dependencies -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
     <!-- msbuild dependencies -->
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
@@ -1,10 +1,10 @@
 {
   "tools": {
-    "dotnet": "9.0.100-preview.6.24311.23"
+    "dotnet": "9.0.100-preview.7.24357.2"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2"
   }
 }
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -23,6 +23,7 @@
     <BuildArgs Condition="'$(DotNetBuildMonoAOTEnableLLVM)' != ''">$(BuildArgs) /p:DotNetBuildMonoAOTEnableLLVM=$(DotNetBuildMonoAOTEnableLLVM)</BuildArgs>
     <BuildArgs Condition="'$(DotNetBuildMonoBundleLLVMOptimizer)' != ''">$(BuildArgs) /p:DotNetBuildMonoBundleLLVMOptimizer=$(DotNetBuildMonoBundleLLVMOptimizer)</BuildArgs>
     <BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)pgoinstrument</BuildArgs>
+    <BuildArgs Condition="'$(UseSystemLibs)' != ''">$(BuildArgs) /p:UseSystemLibs=$(UseSystemLibs)</BuildArgs>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt
@@ -167,9 +167,6 @@ src/runtime/src/libraries/System.ServiceModel.Syndication/tests/TestFeeds/AtomFe
 src/runtime/src/libraries/System.Text.Json/roadmap/images/core-components.txt|unknown-license-reference
 src/runtime/src/libraries/System.Text.Json/roadmap/images/higher-level-components.txt
 
-# Sample data
-src/runtime/src/mono/sample/wasm/browser-webpack/package-lock.json
-
 #
 # sdk
 #
diff --git a/src/Tasks/Common/NuGetUtils.cs b/src/Tasks/Common/NuGetUtils.cs
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -524,6 +524,11 @@ Copyright (c) .NET Foundation. All rights reserved.
                                     Value="$(MetricsSupport)"
                                     Trim="true" />
 
+    <RuntimeHostConfigurationOption Include="System.Diagnostics.StackTrace.IsSupported"
+                                    Condition="'$(StackTraceSupport)' != ''"
+                                    Value="$(StackTraceSupport)"
+                                    Trim="true" />
+
     <RuntimeHostConfigurationOption Include="System.Diagnostics.Tracing.EventSource.IsSupported"
                                     Condition="'$(EventSourceSupport)' != ''"
                                     Value="$(EventSourceSupport)"
diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs
@@ -418,7 +418,7 @@ public async Task InsecureRegistry(bool isInsecureRegistry, bool serverIsHttps,
             X509Certificate2 serverCertificate = request.CreateSelfSigned(DateTimeOffset.Now, DateTimeOffset.Now.AddYears(1));
 
             // https://stackoverflow.com/questions/72096812/loading-x509certificate2-from-pem-file-results-in-no-credentials-are-available/72101855#72101855
-            serverCertificate = new X509Certificate2(serverCertificate.Export(X509ContentType.Pfx));
+            serverCertificate = X509CertificateLoader.LoadPkcs12(serverCertificate.Export(X509ContentType.Pfx), password: "");
 
             sslOptions = new SslServerAuthenticationOptions()
             {
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
@@ -62,6 +62,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string[]
             ""System.ComponentModel.TypeDescriptor.IsComObjectDescriptorSupported"": false,
             ""System.Diagnostics.Debugger.IsSupported"": true,
             ""System.Diagnostics.Metrics.Meter.IsSupported"": false,
+            ""System.Diagnostics.StackTrace.IsSupported"": false,
             ""System.Diagnostics.Tracing.EventSource.IsSupported"": false,
             ""System.Globalization.Invariant"": true,
             ""System.Globalization.PredefinedCulturesOnly"": true,
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs
@@ -79,13 +79,13 @@ public void AoT_Publish_HostedAppWithScopedCss_VisualStudio()
 
             // VS builds projects individually and then a publish with BuildDependencies=false, but building the main project is a close enough approximation for this test.
             var buildCommand = CreateBuildCommand(testInstance, "blazorwasm");
-            ExecuteCommand(buildCommand, "/p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
+            ExecuteCommand(buildCommand, "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();
 
             // Publish
             var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
-            ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
+            ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false", "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();
 
-            var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
+            var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm, "Release");
             var blazorPublishDirectory = Path.Combine(publishDirectory.ToString(), "wwwroot");
 
             // Make sure the main project exists
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs
@@ -128,7 +128,7 @@ public void Build_InRelease_Works()
             var testInstance = CreateAspNetSdkTestAsset(testAppName);
 
             var buildCommand = CreateBuildCommand(testInstance, "blazorwasm");
-            ExecuteCommand(buildCommand,"/p:Configuration=Release")
+            ExecuteCommand(buildCommand, "/p:Configuration=Release")
                 .Should().Pass();
 
             var buildOutputDirectory = buildCommand.GetOutputDirectory(DefaultTfm, "Release").ToString();
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
@@ -706,7 +706,7 @@ public void Publish_HostedApp_WithoutTrimming_Works()
 
             // Publish
             var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
-            ExecuteCommand(publishCommand, "/p:BuildDependencies=false /bl").Should().Pass();
+            ExecuteCommand(publishCommand, "/p:BuildDependencies=false", "/bl").Should().Pass();
 
             var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
             // Make sure the main project exists
@@ -847,7 +847,7 @@ public void Publish_HostedApp_VisualStudio()
 
             // Publish
             var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
-            ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true").Should().Pass();
+            ExecuteCommand(publishCommand, "/p:BuildProjectReferences=false", "/p:BuildInsideVisualStudio=true").Should().Pass();
 
             var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
             // Make sure the main project exists
@@ -927,13 +927,13 @@ public void Publish_HostedAppWithScopedCss_VisualStudio()
 
             // VS builds projects individually and then a publish with BuildDependencies=false, but building the main project is a close enough approximation for this test.
             var buildCommand = CreateBuildCommand(testInstance, "blazorwasm");
-            ExecuteCommand(buildCommand, "/bl:build.msbuild.binlog", "/p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
+            ExecuteCommand(buildCommand, "/bl:build.msbuild.binlog", "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();
 
             // Publish
             var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
-            ExecuteCommand(publishCommand, "/bl:publish.msbuild.binlog", "/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true").Should().Pass();
+            ExecuteCommand(publishCommand, "/bl:publish.msbuild.binlog", "/p:BuildProjectReferences=false", "/p:BuildInsideVisualStudio=true", "/p:Configuration=Release").Should().Pass();
 
-            var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
+            var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm, "Release");
             var blazorPublishDirectory = Path.Combine(publishDirectory.ToString(), "wwwroot");
 
             // Make sure the main project exists
diff --git a/test/Microsoft.NET.TestFramework/AspNetSdkTest.cs b/test/Microsoft.NET.TestFramework/AspNetSdkTest.cs
@@ -129,6 +129,8 @@ protected virtual PublishCommand CreatePublishCommand(TestAsset asset, string re
 
         protected virtual CommandResult ExecuteCommand(TestCommand command, params string[] arguments)
         {
+            ValidateIndividualArgumentsContainNoSpaces(arguments);
+
             if (_generateMSbuildLogs)
             {
                 var i = 0;
@@ -145,6 +147,8 @@ protected virtual CommandResult ExecuteCommand(TestCommand command, params strin
 
         protected virtual CommandResult ExecuteCommandWithoutRestore(MSBuildCommand command, params string[] arguments)
         {
+            ValidateIndividualArgumentsContainNoSpaces(arguments);
+
             if (_generateMSbuildLogs)
             {
                 var i = 0;
@@ -158,6 +162,18 @@ protected virtual CommandResult ExecuteCommandWithoutRestore(MSBuildCommand comm
             }
         }
 
+        private void ValidateIndividualArgumentsContainNoSpaces(string[] arguments)
+        {
+            foreach (var argument in arguments)
+            {
+                // assume our tests don't need to pass msbuild properties with spaces
+                if (argument.Contains(' '))
+                {
+                    throw new ArgumentException($"Individual arguments should not contain spaces to avoid quoting issues when passing to msbuild, pass them as separate array elements instead. Argument: {argument}");
+                }
+            }
+        }
+
         private void ApplyDefaults(MSBuildCommand command)
         {
             if (GetNuGetCachePath() is { } cache)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ internal static class Signature`
`30`	`30`	`internal static unsafe int HasMicrosoftTrustedRoot(string path)`
`31`	`31`	`{`
`32`	`32`	`// Create an X509Certificate2 instance so we can access the certificate context and create a chain context.`
	`33`	`+#pragma warning disable SYSLIB0057 // can't use X509CertificateLoader here since it tries to parse the file as a certificate`
`33`	`34`	`using X509Certificate2 certificate = new(path);`
	`35`	`+#pragma warning restore SYSLIB0057`
`34`	`36`
`35`	`37`	`// We don't use X509Chain because it doesn't support verifying the specific policy and because we defer`
`36`	`38`	`// that to the WinTrust provider as it performs timestamp and revocation checks.`