Skip to content
Open
Show file tree
Hide file tree
Changes from 2 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
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
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
2 changes: 1 addition & 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 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
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 @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/bin/Debug/net10.0/OutputCachingSample.dll",
"program": "${workspaceFolder}/bin/Debug/net11.0/OutputCachingSample.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand All @@ -32,4 +32,4 @@
"request": "attach"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public async Task DeployTestAndAddToSpec(ServerType server, bool ssl, string env
{
Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp),
ApplicationType = ApplicationType.Portable,
TargetFramework = "Net10.0",
TargetFramework = "Net11.0",
EnvironmentName = environment,
SiteName = "HttpTestSite", // This is configured in the Http.config
ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="..\..\build\net10.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
<Import Project="..\..\build\net11.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private static string CreateTestProject()
var classLibProjectContent = """
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

Expand Down Expand Up @@ -85,7 +85,7 @@ public class Class1
<Import Project="{{targetTargetsPath}}" />

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "LESS is a language that compiles into CSS",
"groupIdentity": "Microsoft.DotNet.Web.ClientItems.Less",
"precedence": "10000",
"identity": "Microsoft.DotNet.Web.ClientItems.Less.10.0",
"precedence": "11000",
"identity": "Microsoft.DotNet.Web.ClientItems.Less.11.0",
"shortName": "less",
"sourceName": "styleSheet1",
"tags": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "SCSS is a language that compiles into CSS",
"groupIdentity": "Microsoft.DotNet.Web.ClientItems.Scss",
"precedence": "10000",
"identity": "Microsoft.DotNet.Web.ClientItems.Scss.10.0",
"precedence": "11000",
"identity": "Microsoft.DotNet.Web.ClientItems.Scss.11.0",
"shortName": "scss",
"sourceName": "styleSheet1",
"tags": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "A blank TypeScript source file",
"groupIdentity": "Microsoft.DotNet.Web.ClientItems.TypeScript",
"precedence": "10000",
"identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.10.0",
"precedence": "11000",
"identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.11.0",
"shortName": "tsfile",
"sourceName": "file1",
"tags": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Mvc.ApiController",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Mvc.ApiController.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Mvc.ApiController.11.0",
"shortName": "apicontroller",
"sourceName": "ValueController",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Mvc.MvcController",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Mvc.MvcController.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Mvc.MvcController.11.0",
"shortName": "mvccontroller",
"sourceName": "HomeController",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.Web.Grpc.Protobuf",
"precedence": "10000",
"identity": "Microsoft.Web.Grpc.Protobuf.10.0",
"precedence": "11000",
"identity": "Microsoft.Web.Grpc.Protobuf.11.0",
"shortname": "proto",
"sourceName": "protobuf",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Components.RazorComponent",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Components.RazorComponent.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Components.RazorComponent.11.0",
"shortname": "razorcomponent",
"sourceName": "Component1",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Mvc.RazorPage",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Mvc.RazorPage.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Mvc.RazorPage.11.0",
"shortName": "page",
"sourceName": "Index",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Mvc.RazorView",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Mvc.RazorView.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Mvc.RazorView.11.0",
"shortName": "view",
"sourceName": "Index",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Mvc.ViewImports",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Mvc.ViewImports.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Mvc.ViewImports.11.0",
"shortName": "viewimports",
"sourceName": "ignoreme",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"type": "item"
},
"groupIdentity": "Microsoft.AspNetCore.Mvc.ViewStart",
"precedence": "10000",
"identity": "Microsoft.AspNetCore.Mvc.ViewStart.10.0",
"precedence": "11000",
"identity": "Microsoft.AspNetCore.Mvc.ViewStart.11.0",
"shortName": "viewstart",
"sourceName": "ignoreme",
"primaryOutputs": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"defaultName": "BlazorApp",
"description": "A project template for creating a Blazor web app that supports both server-side rendering and client interactivity. This template can be used for web apps with rich dynamic user interfaces (UIs).",
"groupIdentity": "Microsoft.Web.Blazor",
"precedence": "10000",
"precedence": "11000",
"guids": [
"4C26868E-5E7C-458D-82E3-040509D0C71F",
"5990939C-7E7B-4CFA-86FF-44CA5756498A",
"650B3CE7-2E93-4CC4-9F46-466686815EAA",
"53bc9b9d-9d6a-45d4-8429-2a2761773502"
],
"identity": "Microsoft.Web.Blazor.CSharp.10.0",
"thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices",
"identity": "Microsoft.Web.Blazor.CSharp.11.0",
"thirdPartyNotices": "https://aka.ms/aspnetcore/11.0-third-party-notices",
"preferNameDirectory": true,
"primaryOutputs": [
{
Expand Down Expand Up @@ -209,12 +209,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net10.0",
"description": "Target net10.0"
"choice": "net11.0",
"description": "Target net11.0"
}
],
"replaces": "net10.0",
"defaultValue": "net10.0"
"replaces": "net11.0",
"defaultValue": "net11.0"
},
"HostIdentifier": {
"type": "bind",
Expand Down
Loading
Loading