Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .azure/pipelines/ci-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ stages:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64
buildArgs:
--arch x64
--os-name linux-musl
Expand Down Expand Up @@ -420,7 +420,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64
buildArgs:
--arch arm
--os-name linux-musl
Expand Down Expand Up @@ -453,7 +453,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64
buildArgs:
--arch arm64
--os-name linux-musl
Expand Down Expand Up @@ -654,7 +654,7 @@ stages:
parameters:
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64'
buildScript: './eng/build.sh'
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
jobProperties:
Expand Down
10 changes: 5 additions & 5 deletions .azure/pipelines/ci-unofficial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ extends:
tsa:
enabled: true
containers:
azureLinux30Net10BuildAmd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
azureLinux30Net11BuildAmd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64
stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -414,7 +414,7 @@ extends:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
container: azureLinux30Net10BuildAmd64
container: azureLinux30Net11BuildAmd64
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
Expand Down Expand Up @@ -451,7 +451,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
container: azureLinux30Net11BuildAmd64
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
Expand Down Expand Up @@ -487,7 +487,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
container: azureLinux30Net11BuildAmd64
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
Expand Down
10 changes: 5 additions & 5 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ extends:
tsa:
enabled: true
containers:
azureLinux30Net10BuildAmd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
azureLinux30Net11BuildAmd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-build-amd64
stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -419,7 +419,7 @@ extends:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
container: azureLinux30Net10BuildAmd64
container: azureLinux30Net11BuildAmd64
buildArgs:
--arch x64
--os-name linux-musl
Expand Down Expand Up @@ -453,7 +453,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
container: azureLinux30Net11BuildAmd64
buildArgs:
--arch arm
--os-name linux-musl
Expand Down Expand Up @@ -486,7 +486,7 @@ extends:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: azureLinux30Net10BuildAmd64
container: azureLinux30Net11BuildAmd64
buildArgs:
--arch arm64
--os-name linux-musl
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"remoteEnv": {
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
"DOTNET_MULTILEVEL_LOOKUP": "0",
"TARGET": "net10.0",
"TARGET": "net11.0",
"DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
},
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
Expand Down
3 changes: 3 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project>
<PropertyGroup>
<!-- Workaround while there is no SDK available that understands the TFM; suppress unsupported version errors. -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>

<!-- Disable IsTrimmable on non-DefaultNetCoreTargetFrameworks even if explicitly enabled or else we'll get NETSDK1195 and NETSDK1210 errors -->
<IsTrimmable Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"></IsTrimmable>
<EnableAOTAnalyzer Condition=" '$(EnableAOTAnalyzer)' == '' ">$([MSBuild]::ValueOrDefault($(IsTrimmable),'false'))</EnableAOTAnalyzer>
Expand Down
13 changes: 13 additions & 0 deletions docs/DailyBuilds.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ If you want to download the latest daily build and use it in a project, then you
</configuration>
```

## .NET 11

```xml
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
```

*NOTE: This NuGet.Config should be with your application unless you want nightly packages to potentially start being restored for other apps on the machine.*

Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio.
Expand Down
4 changes: 3 additions & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
src\Components\WebAssembly\Sdk\testassets\Directory.Build.props, and
src\Razor\test\testassets\Directory.Build.props when this changes.
-->
<DefaultNetCoreTargetFramework>net10.0</DefaultNetCoreTargetFramework>
<DefaultNetCoreTargetFramework>net11.0</DefaultNetCoreTargetFramework>
<!-- this should usually match for LTS builds, and be off-by-one otherwise;
example use-case here is OOB packages where Aspire wants to be able to consume
new features specific to OOB -->
Expand All @@ -59,6 +59,8 @@
<UsingToolVSSDK>true</UsingToolVSSDK>
<!-- Disable XLIFF tasks -->
<UsingToolXliff>false</UsingToolXliff>
<!-- Allow missing prune package data when not targeting the current .NET version -->
<AllowMissingPrunePackageData Condition="'$(DefaultNetCoreTargetFramework)' != '$(NetCurrent)'">true</AllowMissingPrunePackageData>
</PropertyGroup>

<!--
Expand Down
2 changes: 1 addition & 1 deletion eng/helix/helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<HelixCorrelationPayload Include="$(NUGET_PACKAGES)\dotnet-serve\$(DotnetServeVersion)\dotnet-serve.$(DotnetServeVersion).nupkg" />

<!-- Grab published `HelixTestRunner` project output. -->
<HelixCorrelationPayload Include="$(ArtifactsBinDir)HelixTestRunner\$(Configuration)\net10.0\publish\"
<HelixCorrelationPayload Include="$(ArtifactsBinDir)HelixTestRunner\$(Configuration)\net11.0\publish\"
Destination="HelixTestRunner" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions eng/testing/linker/SupportFiles/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)" />

<!-- Workaround when there is no vNext SDK available; copy known packs info from 9.0. -->
<KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
<KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="$(TargetFramework)"
Condition="'@(KnownAppHostPack->Count())' != '0' AND
!(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
<KnownRuntimePack Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net9.0'))"
<KnownRuntimePack Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="$(TargetFramework)"
Condition="'@(KnownRuntimePack->Count())' != '0' AND
!(@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
<KnownFrameworkReference Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net9.0'))"
<KnownFrameworkReference Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="$(TargetFramework)"
Condition="'@(KnownFrameworkReference->Count())' != '0' AND
!(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
<KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net9.0'))"
<KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="$(TargetFramework)"
Condition="'@(KnownILLinkPack->Count())' != '0' AND
!(@(KnownILLinkPack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
<KnownILCompilerPack Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net9.0'))"
<KnownILCompilerPack Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="$(TargetFramework)"
Condition="'@(KnownILCompilerPack->Count())' != '0' AND
!(@(KnownILCompilerPack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
Expand Down
16 changes: 8 additions & 8 deletions eng/tools/GenerateFiles/Directory.Build.targets.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,37 @@
<!-- Workaround when there is no vNext SDK available; copy known apphost/framework reference info from 9.0. -->
<ItemGroup>
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownAppHostPack->Count())' != '0' AND
!(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
<KnownRuntimePack
Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownRuntimePack->Count())' != '0' AND
!(@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownFrameworkReference->Count())' != '0' AND
!(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
<KnownILLinkPack
Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownILLinkPack->Count())' != '0' AND
!(@(KnownILLinkPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
<KnownILCompilerPack
Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownILCompilerPack->Count())' != '0' AND
!(@(KnownILCompilerPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
<KnownWebAssemblySdkPack
Include="@(KnownWebAssemblySdkPack->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownWebAssemblySdkPack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownWebAssemblySdkPack->Count())' != '0' AND
!(@(KnownWebAssemblySdkPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
<KnownAspNetCorePack
Include="@(KnownAspNetCorePack->WithMetadataValue('TargetFramework', 'net9.0'))"
Include="@(KnownAspNetCorePack->WithMetadataValue('TargetFramework', 'net10.0'))"
TargetFramework="${DefaultNetCoreTargetFramework}"
Condition="'@(KnownAspNetCorePack->Count())' != '0' AND
!(@(KnownAspNetCorePack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
Expand All @@ -49,7 +49,7 @@
<ItemGroup>
<!--
Reference base shared framework at incoming dependency flow version, not bundled sdk version.
Apply this to all projects that target the default tfm (e.g. net9.0) or a rid-based variant of it (e.g. net9.0-windows)
Apply this to all projects that target the default tfm (e.g. net10.0) or a rid-based variant of it (e.g. net10.0-windows)
-->
<FrameworkReference
Update="Microsoft.NETCore.App"
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/GenerateFiles/GenerateFiles.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. -->
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>

<ConfigDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.config'))</ConfigDirectory>
Expand Down Expand Up @@ -33,7 +33,7 @@
<MakeDir Directories="$(BaseOutputPath)" />

<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(BaseOutputPath)Directory.Build.props" />
<GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)Directory.Build.props.in"

Check failure on line 36 in eng/tools/GenerateFiles/GenerateFiles.csproj

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Source-Build (Managed))

eng/tools/GenerateFiles/GenerateFiles.csproj#L36

eng/tools/GenerateFiles/GenerateFiles.csproj(36,5): error MSB4036: (NETCORE_ENGINEERING_TELEMETRY=Restore) The "GenerateFileFromTemplate" task was not found. Check the following: 1.) The name of the task in the project file is the same as the name of the task class. 2.) The task class is "public" and implements the Microsoft.Build.Framework.ITask interface. 3.) The task is correctly declared with <UsingTask> in the project file, or in the *.tasks files located in the "/__w/1/s/.dotnet/sdk/10.0.100" directory.

Check failure on line 36 in eng/tools/GenerateFiles/GenerateFiles.csproj

View check run for this annotation

Azure Pipelines / aspnetcore-ci

eng/tools/GenerateFiles/GenerateFiles.csproj#L36

eng/tools/GenerateFiles/GenerateFiles.csproj(36,5): error MSB4036: (NETCORE_ENGINEERING_TELEMETRY=Restore) The "GenerateFileFromTemplate" task was not found. Check the following: 1.) The name of the task in the project file is the same as the name of the task class. 2.) The task class is "public" and implements the Microsoft.Build.Framework.ITask interface. 3.) The task is correctly declared with <UsingTask> in the project file, or in the *.tasks files located in the "/__w/1/s/.dotnet/sdk/10.0.100" directory.
Properties="$(_TemplateProperties)"
OutputPath="$(BaseOutputPath)Directory.Build.props" />

Expand Down
2 changes: 1 addition & 1 deletion eng/tools/HelixTestRunner/HelixTestRunner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<PropertyGroup>
<!-- Update helix.proj when this TFM is updated. -->
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>

<OutputType>Exe</OutputType>
<NoWarn>$(NoWarn);CA2007;NU5104</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".net10.0">
<group targetFramework=".net11.0">
<dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$componentAnalyzerVersion$" />
<dependency id="Microsoft.AspNetCore.Authorization" version="$authorizationVersion$" exclude="Build,Analyzers" />
</group>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"runtimeOptions": {
"tfm": "net10.0",
"tfm": "net11.0",
"framework": {
"name": "Microsoft.AspNetCore.App",
"version": "${FrameworkVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public async Task RunsInIISExpressInProcess()
var applicationName = "CreateDefaultBuilderApp";
var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
{
TargetFramework = "net10.0",
TargetFramework = "net11.0",
HostingModel = HostingModel.InProcess
};

Expand Down Expand Up @@ -210,7 +210,7 @@ private async Task ExecuteTestApp(string applicationName,
{
var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitectures.Current)
{
TargetFramework = "net10.0",
TargetFramework = "net11.0",
};

if (setTestEnvVars)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".net10.0">
<group targetFramework=".net11.0">
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsVersion$" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".net10.0">
<group targetFramework=".net11.0">
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/App.Ref/src/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV004</DiagnosticId>
<Target>net10.0</Target>
<Target>net11.0</Target>
</Suppression>
</Suppressions>
</Suppressions>
4 changes: 2 additions & 2 deletions src/Framework/App.Runtime/src/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV0001</DiagnosticId>
<Target>net10.0</Target>
<Target>net11.0</Target>
</Suppression>
</Suppressions>
</Suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
<!-- Don't use ReadyToRun when explicitly opted out -->
<PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
<!-- Disable ReadyToRun when targeting a .NET version without runtime packages (e.g., unreleased versions) -->
<PublishReadyToRun Condition="'$(DefaultNetCoreTargetFramework)' != '$(NetCurrent)'">false</PublishReadyToRun>
<!-- Build a composite R2R image -->
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
<!-- Don't use ReadyToRun when explicitly opted out -->
<PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
<!-- Disable ReadyToRun when targeting a .NET version without runtime packages (e.g., unreleased versions) -->
<PublishReadyToRun Condition="'$(DefaultNetCoreTargetFramework)' != '$(NetCurrent)'">false</PublishReadyToRun>

<InstallerName>$(RuntimeInstallerBaseName)</InstallerName>
<GenerateInstallers>true</GenerateInstallers>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ internal static ReferenceAssemblies GetReferenceAssemblies()
Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"),
"NuGet.config") :
Path.Combine(TestData.GetRepoRoot(), "NuGet.config");
var net10Ref = new ReferenceAssemblies(
"net10.0",
var net11Ref = new ReferenceAssemblies(
"net11.0",
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
TestData.GetMicrosoftNETCoreAppRefPackageVersion()),
Path.Combine("ref", "net10.0"))
Path.Combine("ref", "net11.0"))
.WithNuGetConfigFilePath(nugetConfigPath);

return net10Ref.AddAssemblies(ImmutableArray.Create(
return net11Ref.AddAssemblies(ImmutableArray.Create(
TrimAssemblyExtension(typeof(System.IO.Pipelines.PipeReader).Assembly.Location),
TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServer).Assembly.Location),
TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Authorization.IAuthorizeData).Assembly.Location),
Expand Down
3 changes: 2 additions & 1 deletion src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public static class Tfm
public const string Net80 = "net8.0";
public const string Net90 = "net9.0";
public const string Net100 = "net10.0";
public const string Default = Net100;
public const string Net110 = "net11.0";
public const string Default = Net110;

public static bool Matches(string tfm1, string tfm2)
{
Expand Down
Loading
Loading