Merge branch 'main' into ManagedSignerWithBundles

Author: jtschuster

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25330.2",
+      "version": "1.1.0-beta.25358.3",
       "commands": [
         "darc"
       ]

Directory.Build.props

@@ -96,7 +96,13 @@
     <MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
+    <!-- These are set based on the runtime shared framework and internal versions. This is because windowsdesktop is not built in
+         all VMR builds, but its version numbers are used to generate various bits of information. The VMR always aligns the version
+         numbers of the shared frameworks. -->
+    <MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
+    <MicrosoftWindowsDesktopAppRefPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRefPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftWindowsDesktopAppInternalPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftWindowsDesktopAppInternalPackageVersion>
 
     <HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
     <SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>

documentation/project-docs/developer-guide.md

@@ -8,7 +8,7 @@ In order to build and test the .NET Core Command-line Interface (CLI), you need
 ### For Windows
 
 1. git (available from the [Git Website](http://www.git-scm.com/)) on the PATH.
-2. MSVC, C++ CMake Tools, and C++ ATL through the Visual Studio Installer.
+2. MSVC, C++ CMake Tools, and C++ ATL through the Visual Studio Installer via the "Desktop development with C++" workload.
 
 ### For Linux
 

eng/Version.Details.xml

@@ -7,7 +7,7 @@
     "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
   },
   "tools": {
-    "dotnet": "10.0.100-preview.6.25315.102",
+    "dotnet": "10.0.100-preview.7.25322.101",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.106",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25351.106",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25359.101",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25359.101",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/Versions.props

@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <Import Project="..\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems" Label="Shared" />
   <Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
   <Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
+
   <PropertyGroup>
     <!--
       dotnet-watch may inject this assembly to .NET 6.0+ app.
@@ -15,11 +17,15 @@
     <!-- NuGet -->
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.DotNet.HotReload.Agent.Host</PackageId>
-    <PackageDescription>
-      Package containing Hot Reload agent host.
-    </PackageDescription>
+    <PackageDescription>Package containing Hot Reload agent host.</PackageDescription>
+    <DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
   </PropertyGroup>
 
+  <!-- Reference 6.0.0 targeting packs in Source Build -->
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == 'net6.0'">
+    <FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.Extensions.DotNetDeltaApplier.Tests" />
   </ItemGroup>

global.json

@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\dotnet-watch\Build\MSBuildFileSetResult.cs" />
+    <Compile Include="..\dotnet-watch\Watch\MSBuildFileSetResult.cs" />
   </ItemGroup>
 
 </Project>

src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <!--
       Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.
@@ -14,16 +15,22 @@
     <IsSourcePackage>true</IsSourcePackage>
     <PackageId>Microsoft.DotNet.HotReload.Agent</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <PackageDescription>
-      Package containing sources of Hot Reload agent.
-    </PackageDescription>
+    <PackageDescription>Package containing sources of Hot Reload agent.</PackageDescription>
     <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
   </PropertyGroup>
 
+  <!-- Reference 6.0.0 targeting packs in Source Build -->
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
+  </ItemGroup>
+
   <!-- Make sure the shared source files do not require any global usings -->
   <ItemGroup>
     <Using Remove="@(Using)" />
   </ItemGroup>
+
   <Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
+
 </Project>

src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj

@@ -0,0 +1,47 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.DotNet.Watch;
+
+internal static class PropertyNames
+{
+    public const string TargetFramework = nameof(TargetFramework);
+    public const string TargetFrameworkIdentifier = nameof(TargetFrameworkIdentifier);
+    public const string TargetPath = nameof(TargetPath);
+    public const string EnableDefaultItems = nameof(EnableDefaultItems);
+    public const string TargetFrameworks = nameof(TargetFrameworks);
+    public const string WebAssemblyHotReloadCapabilities = nameof(WebAssemblyHotReloadCapabilities);
+    public const string TargetFrameworkVersion = nameof(TargetFrameworkVersion);
+    public const string TargetName = nameof(TargetName);
+    public const string IntermediateOutputPath = nameof(IntermediateOutputPath);
+    public const string HotReloadAutoRestart = nameof(HotReloadAutoRestart);
+    public const string DefaultItemExcludes = nameof(DefaultItemExcludes);
+    public const string CustomCollectWatchItems = nameof(CustomCollectWatchItems);
+    public const string UsingMicrosoftNETSdkRazor = nameof(UsingMicrosoftNETSdkRazor);
+    public const string DotNetWatchContentFiles = nameof(DotNetWatchContentFiles);
+    public const string DotNetWatchBuild = nameof(DotNetWatchBuild);
+    public const string DesignTimeBuild = nameof(DesignTimeBuild);
+    public const string SkipCompilerExecution = nameof(SkipCompilerExecution);
+    public const string ProvideCommandLineArgs = nameof(ProvideCommandLineArgs);
+}
+
+internal static class ItemNames
+{
+    public const string Watch = nameof(Watch);
+    public const string AdditionalFiles = nameof(AdditionalFiles);
+    public const string Compile = nameof(Compile);
+    public const string Content = nameof(Content);
+    public const string ProjectCapability = nameof(ProjectCapability);
+}
+
+internal static class MetadataNames
+{
+    public const string Watch = nameof(Watch);
+}
+
+internal static class TargetNames
+{
+    public const string Compile = nameof(Compile);
+    public const string Restore = nameof(Restore);
+    public const string GenerateComputedBuildStaticWebAssets = nameof(GenerateComputedBuildStaticWebAssets);
+}