Skip to content

Update .NET 11 to preview 4 #84

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

Update .NET 11 to preview 4 #84

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: 1 addition & 1 deletion 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
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

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

<Import Project="Generated.targets" />
Expand Down
3,642 changes: 1,821 additions & 1,821 deletions Src/Basic.Reference.Assemblies.AspNet110/Generated.cs
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 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
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

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

<Import Project="Generated.targets" />
Expand Down
2,052 changes: 1,161 additions & 891 deletions Src/Basic.Reference.Assemblies.Net110/Generated.cs
View file
Open in desktop

Large diffs are not rendered by default.

708 changes: 372 additions & 336 deletions Src/Basic.Reference.Assemblies.Net110/Generated.targets
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Src/Generate/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void Net100Wasm()

void Net110()
{
var content = GetGeneratedContent("Net110", [@"microsoft.netcore.app.ref/11.0.0-preview.3.26207.106/ref/net11.0"]);
var content = GetGeneratedContent("Net110", [@"microsoft.netcore.app.ref/11.0.0-preview.4.26230.115/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);
Expand Down Expand Up @@ -153,7 +153,7 @@ void AspNet100()

void AspNet110()
{
var content = GetGeneratedContent("AspNet110", [@"microsoft.netcore.app.ref/11.0.0-preview.3.26207.106/ref/net11.0", @"microsoft.aspnetcore.app.ref/11.0.0-preview.3.26207.106/ref/net11.0"]);
var content = GetGeneratedContent("AspNet110", [@"microsoft.netcore.app.ref/11.0.0-preview.4.26230.115/ref/net11.0", @"microsoft.aspnetcore.app.ref/11.0.0-preview.4.26230.115/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);
Expand Down Expand Up @@ -609,13 +609,13 @@ public static ImmutableArray<PortableExecutableReference> All
foreach (var packagePath in packagePaths)
{
dllPaths.AddRange(Directory.GetFiles(packagePath, "*.dll"));

var facadesPath = Path.Combine(packagePath, "Facades");
if (Directory.Exists(facadesPath))
{
dllPaths.AddRange(Directory.GetFiles(facadesPath, "*.dll"));
}

var nativePath = Path.GetFullPath(Path.Combine(packagePath, "..", "..", "native"));
if (Directory.Exists(nativePath))
{
Expand All @@ -634,7 +634,7 @@ public static ImmutableArray<PortableExecutableReference> All
{
continue;
}

var relativeFilePath = dllPath.Substring(packagePrefix.Length);
yield return (dllPath, relativeFilePath, mvid);
}
Expand Down
Loading