Skip to content

Commit 932985b

Browse files
SimonZhao888SimonZhao888
authored
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-release/10.0.2xx
2 parents 0235c63 + b56a9fa commit 932985b

File tree

48 files changed

+435
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+435
-158
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ Localization:
3131

3232
Documentation:
3333
- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.
34+
35+
External Dependencies:
36+
- Changes that require modifications to the dotnet/templating repository (Microsoft.TemplateEngine packages) should be made directly in that repository, not worked around in this repo.
37+
- The dotnet/templating repository owns the TemplateEngine.Edge, TemplateEngine.Abstractions, and related packages.
38+
- If a change requires updates to template engine behavior or formatting (e.g., DisplayName properties), file an issue in dotnet/templating and make the changes there rather than adding workarounds in this SDK repository.

‎.vsts-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
branches:
66
include:
77
- main
8-
- release/10.0.1*
8+
- release/10.0.2*
99
- internal/release/*
1010
- exp/*
1111

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PropertyGroup Label="Repo version information">
77
<VersionMajor>10</VersionMajor>
88
<VersionMinor>0</VersionMinor>
9-
<VersionSDKMinor>1</VersionSDKMinor>
9+
<VersionSDKMinor>2</VersionSDKMinor>
1010
<VersionFeature>00</VersionFeature>
1111
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1212
It should always be the hundreds-value of the current SDK version, never any
@@ -20,10 +20,10 @@
2020
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
2121
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2222
<!-- Calculate prerelease label -->
23-
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel>
23+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
2424
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
2525
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
26-
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'"></PreReleaseVersionIteration>
26+
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">0</PreReleaseVersionIteration>
2727
<!-- In source-build the version of the compiler must be same or newer than the version of the
2828
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
2929
in that build mode analyzer assemblies always target the live compiler API. -->

‎sdk.slnx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@
4949
<Project Path="src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj" />
5050
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj" />
5151
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj" />
52+
<Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj" />
53+
<Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj" />
5254
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj" />
5355
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj" />
5456
<Project Path="src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
5557
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj" />
5658
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj" />
5759
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj" />
58-
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" Id="a78ff92a-d715-4249-9e3d-40d9997a098f" />
60+
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" />
61+
<Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj" />
62+
<Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj" />
5963
</Folder>
6064
<Folder Name="/src/Cli/">
6165
<Project Path="src/Cli/dotnet/dotnet.csproj" />

‎src/BuiltInTools/BrowserRefresh/.editorconfig‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,13 @@
55
When updating the TFM also update minimal supported version in dotnet-watch.csproj and WebApplicationAppModel.cs.
66
-->
77
<TargetFramework>net6.0</TargetFramework>
8-
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
9-
10-
<!-- NuGet -->
11-
<IsPackable>true</IsPackable>
12-
<IsShipping>true</IsShipping>
13-
<IsShippingPackage>true</IsShippingPackage>
14-
<PackageId>Microsoft.DotNet.HotReload.Web.Middleware</PackageId>
15-
<PackageDescription>Package containing Hot Reload middleware.</PackageDescription>
168
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
9+
10+
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
1711
</PropertyGroup>
1812

1913
<ItemGroup>
2014
<FrameworkReference Include="Microsoft.AspNetCore.App" />
21-
<EmbeddedResource Include="WebSocketScriptInjection.js" />
22-
23-
<!-- Back compat only -->
24-
<EmbeddedResource Include="BlazorHotReload.js" />
2515
</ItemGroup>
2616

2717
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
@@ -34,4 +24,5 @@
3424
<InternalsVisibleTo Include="Microsoft.AspNetCore.Watch.BrowserRefresh.Tests" />
3525
</ItemGroup>
3626

27+
<Import Project="..\Web.Middleware\Microsoft.DotNet.HotReload.Web.Middleware.projitems" Label="Shared" />
3728
</Project>

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<Import Project="..\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems" Label="Shared" />
4-
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
5-
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
6-
72
<PropertyGroup>
83
<!--
94
dotnet-watch may inject this assembly to .NET 6.0+ app.
@@ -13,26 +8,19 @@
138
-->
149
<TargetFrameworks>net6.0;net10.0</TargetFrameworks>
1510
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
16-
17-
<!-- NuGet -->
18-
<IsPackable>true</IsPackable>
19-
<IsShipping>true</IsShipping>
20-
<IsShippingPackage>true</IsShippingPackage>
21-
<PackageId>Microsoft.DotNet.HotReload.Agent.Host</PackageId>
22-
<PackageDescription>Package containing Hot Reload agent host.</PackageDescription>
23-
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
2411
</PropertyGroup>
2512

2613
<!-- Reference 6.0.0 targeting packs in Source Build -->
2714
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == 'net6.0'">
2815
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
2916
</ItemGroup>
30-
<ItemGroup>
31-
<Compile Include="..\dotnet-watch\Utilities\ProcessUtilities.cs" Link="ProcessUtilities.cs" />
32-
</ItemGroup>
3317

3418
<ItemGroup>
3519
<InternalsVisibleTo Include="Microsoft.Extensions.DotNetDeltaApplier.Tests" />
3620
</ItemGroup>
3721

22+
<Import Project="..\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems" Label="Shared" />
23+
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
24+
<Import Project="..\HotReloadAgent.Host\Microsoft.DotNet.HotReload.Agent.Host.projitems" Label="Shared" />
25+
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
3826
</Project>

‎src/BuiltInTools/HotReloadAgent.Host/.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[*.cs]
2+
3+
# IDE0240: Remove redundant nullable directive
4+
# The directive needs to be included since all sources in a source package are considered generated code
5+
# when referenced from a project via package reference.
6+
dotnet_diagnostic.IDE0240.severity = none

‎src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<!--
5+
This code may be injected into a .NET 6.0+ app.
6+
7+
When updating these also update ProjectReferences in dotnet-watch.csproj
8+
and HotReloadAppModel.TryGetStartupHookPath.
9+
-->
10+
<TargetFrameworks>net6.0;net10.0</TargetFrameworks>
11+
<DisableTransitiveFrameworkReferenceDownloads Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</DisableTransitiveFrameworkReferenceDownloads>
12+
13+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
14+
<DebugType>none</DebugType>
15+
<GenerateDependencyFile>false</GenerateDependencyFile>
16+
<LangVersion>preview</LangVersion>
17+
18+
<!-- NuGet -->
19+
<IsPackable>true</IsPackable>
20+
<IsShipping>true</IsShipping>
21+
<IsSourcePackage>true</IsSourcePackage>
22+
<PackageId>Microsoft.DotNet.HotReload.Agent.Host</PackageId>
23+
<IncludeBuildOutput>false</IncludeBuildOutput>
24+
<PackageDescription>Package containing Hot Reload agent host.</PackageDescription>
25+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
26+
<NoWarn>$(NoWarn);NU5128</NoWarn>
27+
</PropertyGroup>
28+
29+
<!-- Reference 6.0.0 targeting packs in Source Build -->
30+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(TargetFramework)' == 'net6.0'">
31+
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
32+
</ItemGroup>
33+
34+
<Import Project="..\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems" Label="Shared" />
35+
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
36+
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
37+
38+
<!-- Make sure the shared source files do not require any global usings -->
39+
<ItemGroup>
40+
<Using Remove="@(Using)" />
41+
</ItemGroup>
42+
</Project>

‎src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.projitems‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<SharedGUID>15C936B2-901D-4A27-AFA6-89CF56F5EB20</SharedGUID>
7+
</PropertyGroup>
8+
<PropertyGroup Label="Configuration">
9+
<Import_RootNamespace>Microsoft.DotNet.HotReload</Import_RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="$(MSBuildThisFileDirectory)**\*.cs" />
13+
</ItemGroup>
14+
</Project>

0 commit comments

Comments
 (0)