Skip to content

Commit 550c2ff

Browse files
authored
Add .NET 11 preview 2 (#80)
1 parent d0e21a3 commit 550c2ff

File tree

8 files changed

+16497
-2
lines changed

8 files changed

+16497
-2
lines changed

Basic.Reference.Assemblies.slnx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
<Platform Name="x86" />
66
</Configurations>
77
<Project Path="Src/Basic.Reference.Assemblies.AspNet100/Basic.Reference.Assemblies.AspNet100.csproj" />
8+
<Project Path="Src/Basic.Reference.Assemblies.AspNet110/Basic.Reference.Assemblies.AspNet110.csproj" />
89
<Project Path="Src/Basic.Reference.Assemblies.AspNet80/Basic.Reference.Assemblies.AspNet80.csproj" />
910
<Project Path="Src/Basic.Reference.Assemblies.AspNet90/Basic.Reference.Assemblies.AspNet90.csproj" />
1011
<Project Path="Src/Basic.Reference.Assemblies.Net100/Basic.Reference.Assemblies.Net100.csproj" />
12+
<Project Path="Src/Basic.Reference.Assemblies.Net110/Basic.Reference.Assemblies.Net110.csproj" />
1113
<Project Path="Src/Basic.Reference.Assemblies.Net20/Basic.Reference.Assemblies.Net20.csproj" />
1214
<Project Path="Src/Basic.Reference.Assemblies.Net35/Basic.Reference.Assemblies.Net35.csproj" />
1315
<Project Path="Src/Basic.Reference.Assemblies.Net40/Basic.Reference.Assemblies.Net40.csproj" />
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<IsPackable>true</IsPackable>
6+
<RunAnalyzers>false</RunAnalyzers>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.AspNetCore.App.Ref" Version="11.0.0-preview.2.26159.112" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
11+
</ItemGroup>
12+
13+
<Import Project="Generated.targets" />
14+
</Project>

Src/Basic.Reference.Assemblies.AspNet110/Generated.cs

Lines changed: 9381 additions & 0 deletions
Large diffs are not rendered by default.

Src/Basic.Reference.Assemblies.AspNet110/Generated.targets

Lines changed: 1240 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<IsPackable>true</IsPackable>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.2.26159.112" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
10+
</ItemGroup>
11+
12+
<Import Project="Generated.targets" />
13+
</Project>

Src/Basic.Reference.Assemblies.Net110/Generated.cs

Lines changed: 5151 additions & 0 deletions
Large diffs are not rendered by default.

Src/Basic.Reference.Assemblies.Net110/Generated.targets

Lines changed: 676 additions & 0 deletions
Large diffs are not rendered by default.

Src/Generate/Program.cs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
Net80Windows();
1818
Net90();
1919
Net100();
20+
Net110();
2021
AspNet80();
2122
AspNet90();
2223
AspNet100();
24+
AspNet110();
2325
NetStandard13();
2426
NetStandard20();
2527
NetStandard21();
@@ -106,6 +108,14 @@ void Net100()
106108
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
107109
}
108110

111+
void Net110()
112+
{
113+
var content = GetGeneratedContent("Net110", [@"microsoft.netcore.app.ref/11.0.0-preview.2.26159.112/ref/net11.0"]);
114+
var targetDir = Path.Combine(srcPath, "Basic.Reference.Assemblies.Net110");
115+
File.WriteAllText(Path.Combine(targetDir, "Generated.cs"), content.CodeContent, encoding);
116+
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
117+
}
118+
109119
void AspNet80()
110120
{
111121
var content = GetGeneratedContent("AspNet80", [@"microsoft.netcore.app.ref/8.0.3/ref/net8.0", @"microsoft.aspnetcore.app.ref/8.0.3/ref/net8.0"]);
@@ -131,6 +141,14 @@ void AspNet100()
131141
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
132142
}
133143

144+
void AspNet110()
145+
{
146+
var content = GetGeneratedContent("AspNet110", [@"microsoft.netcore.app.ref/11.0.0-preview.2.26159.112/ref/net11.0", @"microsoft.aspnetcore.app.ref/11.0.0-preview.2.26159.112/ref/net11.0"]);
147+
var targetDir = Path.Combine(srcPath, "Basic.Reference.Assemblies.AspNet110");
148+
File.WriteAllText(Path.Combine(targetDir, "Generated.cs"), content.CodeContent, encoding);
149+
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
150+
}
151+
134152
void NetStandard13()
135153
{
136154
// netstandard1.3 is a special case because it's not a single package. Instead the collection of DLLs that make
@@ -460,7 +478,7 @@ void ProcessDlls(
460478
string targetsPrefix,
461479
string refName,
462480
StringBuilder targetsContent,
463-
StringBuilder resourcesContent,
481+
StringBuilder resourcesContent,
464482
StringBuilder refContent,
465483
StringBuilder refInfoContent)
466484
{
@@ -610,7 +628,7 @@ public static ImmutableArray<PortableExecutableReference> All
610628
}
611629

612630
var realPackagePaths = packagePaths.Select(x => Path.Combine(nugetPackageRoot, x)).ToArray();
613-
var realExtraPackagePaths = extraPackagePaths is not null
631+
var realExtraPackagePaths = extraPackagePaths is not null
614632
? extraPackagePaths.Select(x => Path.Combine(nugetPackageRoot, x)).ToArray()
615633
: [];
616634
return GetGeneratedContentCore(name, realPackagePaths, realExtraPackagePaths, nugetPackageRoot, "$(NuGetPackageRoot)");

0 commit comments

Comments
 (0)