Merge branch 'main' into enable_runtimeConfig

pavelsavara · pavelsavara · commit 8584994c0226 · 2025-05-16T12:36:10.000+02:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25259.3",
+      "version": "1.1.0-beta.25264.3",
       "commands": [
         "darc"
       ]
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -145,33 +145,6 @@ extends:
                 _SignType: real
               dependsOn: Official_windows_x64
               downloadManifestMsiPackages: true
-            ### PGO ###
-            - categoryName: PGO
-              pgoInstrument: true
-              publishArgument: $(_publishArgument)
-              signArgument: $(_signArgument)
-              officialBuildProperties: $(_officialBuildProperties)
-              runTests: false
-              variables:
-                _SignType: real
-            - categoryName: PGO
-              pgoInstrument: true
-              targetArchitecture: x86
-              publishArgument: $(_publishArgument)
-              signArgument: $(_signArgument)
-              officialBuildProperties: $(_officialBuildProperties)
-              runTests: false
-              variables:
-                _SignType: real
-            - categoryName: PGO
-              pgoInstrument: true
-              targetArchitecture: arm64
-              publishArgument: $(_publishArgument)
-              signArgument: $(_signArgument)
-              officialBuildProperties: $(_officialBuildProperties)
-              runTests: false
-              variables:
-                _SignType: real
 
       ############### LINUX ###############
       - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
@@ -266,21 +239,6 @@ extends:
               officialBuildProperties: $(_officialBuildProperties)
               osProperties: /p:OSName=linux-musl
               runTests: false
-            ### PGO ###
-            - categoryName: PGO
-              pgoInstrument: true
-              publishArgument: $(_publishArgument)
-              officialBuildProperties: $(_officialBuildProperties)
-              osProperties: $(linuxOsPortableProperties)
-              runTests: false
-            - categoryName: PGO
-              pgoInstrument: true
-              targetArchitecture: arm64
-              runtimeIdentifier: linux-arm64
-              publishArgument: $(_publishArgument)
-              officialBuildProperties: $(_officialBuildProperties)
-              osProperties: $(linuxOsPortableProperties)
-              runTests: false
 
       ############### MACOS ###############
       - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -62,6 +62,9 @@
 
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+
+    <!-- https://github.com/dotnet/source-build/issues/4115. -->
+    <PublishWindowsPdb>false</PublishWindowsPdb>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
diff --git a/documentation/general/dotnet-run-file.md b/documentation/general/dotnet-run-file.md
@@ -7,6 +7,8 @@ We call these *file-based programs* (as opposed to *project-based programs*).
 dotnet run file.cs
 ```
 
+See also [IDE spec](https://github.com/dotnet/roslyn/blob/main/docs/features/file-based-programs-vscode.md).
+
 ## Motivation
 
 File-based programs
@@ -71,7 +73,7 @@ Internally, the SDK CLI detects entry points by parsing all `.cs` files in the d
 and checking which ones contain top-level statements (`Main` methods are not supported for now as that would require full semantic analysis, not just parsing).
 Results of this detection are used to exclude other entry points from [builds](#multiple-entry-points) and [app directive collection](#directives-for-project-metadata).
 This means the CLI might consider a file to be an entry point which later the compiler doesn't
-(for example because its top-level statements are under `#if SYMBOL` and the build has `DefineConstants=SYMBOL`).
+(for example because its top-level statements are under `#if !SYMBOL` and the build has `DefineConstants=SYMBOL`).
 However such inconsistencies should be rare and hence that is a better trade off than letting the compiler decide which files are entry points
 because that could require multiple builds (first determine entry points and then re-build with app directives except those from other entry points).
 To avoid parsing all C# files twice (in CLI and in the compiler), the CLI could use the compiler server for parsing so the trees are reused
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/eng/common/build.sh b/eng/common/build.sh
@@ -136,7 +136,7 @@ while [[ $# > 0 ]]; do
       restore=true
       pack=true
       ;;
-    -productBuild|-pb)
+    -productbuild|-pb)
       build=true
       product_build=true
       restore=true
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
@@ -51,13 +51,12 @@ steps:
     ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
       --configuration $buildConfig \
       --restore --build --pack -bl \
+      --source-build \
       ${{ parameters.platform.buildArguments }} \
       $internalRuntimeDownloadArgs \
       $targetRidArgs \
       $baseRidArgs \
       $portableBuildArgs \
-      /p:DotNetBuildSourceOnly=true \
-      /p:DotNetBuildRepo=true \
   displayName: Build
 
 - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
@@ -68,7 +68,7 @@ function InstallDarcCli {
     fi
   fi
 
-  local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
+  local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
 
   echo "Installing Darc CLI version $darcVersion..."
   echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.199.0"/>
+  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
 </packages>
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
 # True if the build is a product build
 [bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
 
-[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
-
 function Create-Directory ([string[]] $path) {
     New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
 }
@@ -853,7 +851,7 @@ function MSBuild-Core() {
 
     # When running on Azure Pipelines, override the returned exit code to avoid double logging.
     # Skip this when the build is a child of the VMR orchestrator build.
-    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
+    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
       Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
       # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
       # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
@@ -507,7 +507,7 @@ function MSBuild-Core {
 
       # When running on Azure Pipelines, override the returned exit code to avoid double logging.
       # Skip this when the build is a child of the VMR orchestrator build.
-      if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
+      if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
         Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
         # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
         # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
@@ -10,7 +10,7 @@ function InitializeCustomSDKToolset {
 
   # The following frameworks and tools are used only for testing.
   # Do not attempt to install them in source build.
-  if ($productBuild -or $properties -like "*DotNetBuildRepo=true*") {
+  if ($productBuild) {
     return
   }
 
diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh
@@ -7,7 +7,7 @@ function InitializeCustomSDKToolset {
 
   # The following frameworks and tools are used only for testing.
   # Do not attempt to install them in source build.
-  if [[ $product_build == true || $properties == *"DotNetBuildRepo=true"* ]]; then
+  if [[ $product_build == true ]]; then
     return
   fi
 
diff --git a/global.json b/global.json
@@ -14,8 +14,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25260.104",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }
diff --git a/src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs
@@ -43,7 +43,7 @@ private static Command ConstructCommand()
             }
             else
             {
-                return new PackageAddCommand(parseResult, parseResult.GetValue(AddCommandParser.ProjectArgument)).Execute();
+                return new PackageAddCommand(parseResult, parseResult.GetValue(AddCommandParser.ProjectArgument) ?? Directory.GetCurrentDirectory()).Execute();
             }
         });
 
diff --git a/src/Cli/dotnet/Commands/Reference/List/ReferenceListCommand.cs b/src/Cli/dotnet/Commands/Reference/List/ReferenceListCommand.cs
@@ -22,7 +22,8 @@ public ReferenceListCommand(
 
         _fileOrDirectory = parseResult.HasOption(ReferenceCommandParser.ProjectOption) ?
             parseResult.GetValue(ReferenceCommandParser.ProjectOption) :
-            parseResult.GetValue(ListCommandParser.SlnOrProjectArgument);
+            parseResult.GetValue(ListCommandParser.SlnOrProjectArgument) ??
+            Directory.GetCurrentDirectory();
     }
 
     public override int Execute()
diff --git a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
@@ -362,7 +362,19 @@ Building because previous global properties count ({previousCacheEntry.GlobalPro
     private void MarkBuildStart()
     {
         string directory = GetArtifactsPath();
-        Directory.CreateDirectory(directory);
+
+        if (OperatingSystem.IsWindows())
+        {
+            Directory.CreateDirectory(directory);
+        }
+        else
+        {
+            // Ensure only the current user has access to the directory to avoid leaking the program to other users.
+            // We don't mind that permissions might be different if the directory already exists,
+            // since it's under user's local directory and its path should be unique.
+            Directory.CreateDirectory(directory, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
+        }
+
         File.WriteAllText(Path.Join(directory, BuildStartCacheFileName), EntryPointFileFullPath);
     }
 
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
@@ -164,8 +164,6 @@ public static string GetTestRunnerName()
         var builder = new ConfigurationBuilder();
 
         string? dotnetConfigPath = GetDotnetConfigPath(Environment.CurrentDirectory);
-        Debug.Assert(dotnetConfigPath is not null);
-
         if (!File.Exists(dotnetConfigPath))
         {
             return CliConstants.VSTest;
diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs
@@ -191,7 +191,6 @@ private int ExecuteCore(
                 b.RegisterExtensions();
 
                 b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
-                b.Features.Add(new DefaultTypeNameFeature());
 
                 b.ConfigureCodeGenerationOptions(b =>
                 {
diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets
@@ -244,6 +244,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <StaticWebAsset Include="@(_CompressionBuildStaticWebAsset)" />
       <StaticWebAssetEndpoint Include="@(_CompressionBuildStaticWebAssetEndpoint)" />
       <_CompressionCurrentProjectBuildAssets Include="@(StaticWebAsset)" />
+      <FileWrites Include="@(_ResolveBuildCompressedStaticWebAssetsCachePath)" />
     </ItemGroup>
 
     <ApplyCompressionNegotiation
diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
@@ -165,6 +165,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <StaticWebAsset Include="@(_JSModuleStaticWebAsset)" />
       <StaticWebAssetEndpoint Remove="@(_FilteredJSModuleStaticWebAssetEndpointWithProperty)" />
       <StaticWebAssetEndpoint Include="@(_FilteredJSModuleStaticWebAssetEndpointWithProperty)" />
+      <FileWrites Include="$(_ResolveJsInitializerModuleStaticWebAssetsCachePath)" />
     </ItemGroup>
 
   </Target>
@@ -496,6 +497,9 @@ Copyright (c) .NET Foundation. All rights reserved.
       <!-- Remove the items from their original groups since they've now become a StaticWebAsset -->
       <Content Remove="@(_JsFileModuleStaticWebAsset->'%(OriginalItemSpec)')" />
       <None Remove="@(_JsFileModuleStaticWebAsset->'%(OriginalItemSpec)')" />
+
+      <FileWrites Include="$(_ResolveJSModuleStaticWebAssetsRazorCachePath)" />
+      <FileWrites Include="$(_ResolveJSModuleStaticWebAssetsCshtmlCachePath)" />
     </ItemGroup>
 
   </Target>
diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets
@@ -707,6 +707,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       </StaticWebAssetDiscoveryPattern>
 
       <Content Remove="@(StaticWebAsset)" />
+
+      <FileWrites Include="$(_ResolveProjectStaticWebAssetsCachePath)" />
     </ItemGroup>
 
   </Target>
diff --git a/src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.Cache.cs b/src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.Cache.cs
@@ -165,6 +165,8 @@ private void TotalUpdate(byte[] propertiesHash, byte[] fingerprintPatternsHash,
             GlobalPropertiesHash = propertiesHash;
             FingerprintPatternsHash = fingerprintPatternsHash;
             PropertyOverridesHash = propertyOverridesHash;
+            CachedAssets.Clear();
+            CachedCopyCandidates.Clear();
             InputHashes = [.. inputsByHash.Keys];
             _inputByHash = inputsByHash;
         }
diff --git a/src/StaticWebAssetsSdk/Tasks/OverrideHtmlAssetPlaceholders.cs b/src/StaticWebAssetsSdk/Tasks/OverrideHtmlAssetPlaceholders.cs
@@ -98,7 +98,9 @@ public override bool Execute()
                         fileWrites.Add(outputPath);
                     }
 
-                    htmlCandidates.Add(new TaskItem(outputPath, item.CloneCustomMetadata()));
+                    var newItem = new TaskItem(outputPath, item.CloneCustomMetadata());
+                    newItem.RemoveMetadata("OriginalItemSpec");
+                    htmlCandidates.Add(newItem);
                 }
             }
         }
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs
@@ -605,6 +605,8 @@ public void DefineStaticWebAssetsCache_Recomputes_All_WhenPropertiesChange(Updat
 
             Assert.False(cache.IsUpToDate());
             Assert.Same(inputHashes, cache.OutOfDateInputs());
+            Assert.Empty(cache.CachedAssets);
+            Assert.Empty(cache.CachedCopyCandidates);
         }
 
         [Fact]
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsFingerprintingTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsFingerprintingTest.cs
diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"microsoft.dotnet.darc": {`
`6`		`- "version": "1.1.0-beta.25259.3",`
	`6`	`+ "version": "1.1.0-beta.25264.3",`
`7`	`7`	`"commands": [`
`8`	`8`	`"darc"`
`9`	`9`	`]`