Skip to content

Add .NET 11 preview 2 #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glen-84 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add .NET 11 preview 2 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Basic.Reference.Assemblies.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
<Platform Name="x86" />
</Configurations>
<Project Path="Src/Basic.Reference.Assemblies.AspNet100/Basic.Reference.Assemblies.AspNet100.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.AspNet110/Basic.Reference.Assemblies.AspNet110.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.AspNet80/Basic.Reference.Assemblies.AspNet80.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.AspNet90/Basic.Reference.Assemblies.AspNet90.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.Net100/Basic.Reference.Assemblies.Net100.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.Net110/Basic.Reference.Assemblies.Net110.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.Net20/Basic.Reference.Assemblies.Net20.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.Net35/Basic.Reference.Assemblies.Net35.csproj" />
<Project Path="Src/Basic.Reference.Assemblies.Net40/Basic.Reference.Assemblies.Net40.csproj" />
Expand Down
14 changes: 14 additions & 0 deletions Src/Basic.Reference.Assemblies.AspNet110/Basic.Reference.Assemblies.AspNet110.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IsPackable>true</IsPackable>
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App.Ref" Version="11.0.0-preview.2.26159.112" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<Import Project="Generated.targets" />
</Project>
9,381 changes: 9,381 additions & 0 deletions Src/Basic.Reference.Assemblies.AspNet110/Generated.cs
View file
Open in desktop

Large diffs are not rendered by default.

1,240 changes: 1,240 additions & 0 deletions Src/Basic.Reference.Assemblies.AspNet110/Generated.targets
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions Src/Basic.Reference.Assemblies.Net110/Basic.Reference.Assemblies.Net110.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.2.26159.112" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<Import Project="Generated.targets" />
</Project>
5,151 changes: 5,151 additions & 0 deletions Src/Basic.Reference.Assemblies.Net110/Generated.cs
View file
Open in desktop

Large diffs are not rendered by default.

676 changes: 676 additions & 0 deletions Src/Basic.Reference.Assemblies.Net110/Generated.targets
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 20 additions & 2 deletions Src/Generate/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
Net80Windows();
Net90();
Net100();
Net110();
AspNet80();
AspNet90();
AspNet100();
AspNet110();
NetStandard13();
NetStandard20();
NetStandard21();
Expand Down Expand Up @@ -106,6 +108,14 @@ void Net100()
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
}

void Net110()
{
var content = GetGeneratedContent("Net110", [@"microsoft.netcore.app.ref/11.0.0-preview.2.26159.112/ref/net11.0"]);
var targetDir = Path.Combine(srcPath, "Basic.Reference.Assemblies.Net110");
File.WriteAllText(Path.Combine(targetDir, "Generated.cs"), content.CodeContent, encoding);
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
}

void AspNet80()
{
var content = GetGeneratedContent("AspNet80", [@"microsoft.netcore.app.ref/8.0.3/ref/net8.0", @"microsoft.aspnetcore.app.ref/8.0.3/ref/net8.0"]);
Expand All @@ -131,6 +141,14 @@ void AspNet100()
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
}

void AspNet110()
{
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"]);
var targetDir = Path.Combine(srcPath, "Basic.Reference.Assemblies.AspNet110");
File.WriteAllText(Path.Combine(targetDir, "Generated.cs"), content.CodeContent, encoding);
File.WriteAllText(Path.Combine(targetDir, "Generated.targets"), content.TargetsContent, encoding);
}

void NetStandard13()
{
// netstandard1.3 is a special case because it's not a single package. Instead the collection of DLLs that make
Expand Down Expand Up @@ -460,7 +478,7 @@ void ProcessDlls(
string targetsPrefix,
string refName,
StringBuilder targetsContent,
StringBuilder resourcesContent,
StringBuilder resourcesContent,
StringBuilder refContent,
StringBuilder refInfoContent)
{
Expand Down Expand Up @@ -610,7 +628,7 @@ public static ImmutableArray<PortableExecutableReference> All
}

var realPackagePaths = packagePaths.Select(x => Path.Combine(nugetPackageRoot, x)).ToArray();
var realExtraPackagePaths = extraPackagePaths is not null
var realExtraPackagePaths = extraPackagePaths is not null
? extraPackagePaths.Select(x => Path.Combine(nugetPackageRoot, x)).ToArray()
: [];
return GetGeneratedContentCore(name, realPackagePaths, realExtraPackagePaths, nugetPackageRoot, "$(NuGetPackageRoot)");
Expand Down