diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1fc13301ed49..3d788905133c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -37,7 +37,7 @@ "remoteEnv": { "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}", "DOTNET_MULTILEVEL_LOOKUP": "0", - "TARGET": "net8.0", + "TARGET": "net9.0", "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true" }, // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. diff --git a/docs/UpdatingMajorVersionAndTFM.md b/docs/UpdatingMajorVersionAndTFM.md index dc1793dd294f..03451dd94978 100644 --- a/docs/UpdatingMajorVersionAndTFM.md +++ b/docs/UpdatingMajorVersionAndTFM.md @@ -33,11 +33,12 @@ Typically, we will update the Major Version before updating the TFM. This is bec ## Updating TFM -Once dotnet/runtime has updated their TFM, we update ours in the dependency update PR ingesting that change. We won't be able to ingest new dotnet/runtime dependencies in `main` until this is done. For an example, [this](https://github.com/dotnet/aspnetcore/pull/36328) is the PR where we updated our TFM to `net8.0`. This step can be tricky - we have workarounds in [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in) to make the build work before we get an SDK containing runtime references with the new TFM. We copy the `KnownFrameworkReference`, `KnownRuntimePack`, and `KnownAppHostPack` from the previous TFM, give them the incoming runtime dependency versions, and give them the new TFM (these TFMs no-op most of the time - they only apply during this period when we're using an SDK that doesn't know about the new TFM). These workarounds allow us to build against the new TFM before we get an SDK with a reference to it, but there are often problems that arise in this area. The best way to debug build errors related to FrameworkReferences it to get a binlog of a failing project (`dotnet build /bl`) and look at the inputs to the task that failed. Confirm that the `Known___` items look as expected (there is an entry with the current TFM & the current dotnet/runtime dependency version), and look at the source code of the task in [dotnet/sdk](https://github.com/dotnet/sdk) for hints. +Once dotnet/runtime has updated their TFM, we update ours in the dependency update PR ingesting that change. We won't be able to ingest new dotnet/runtime dependencies in `main` until this is done. For an example, [this](https://github.com/dotnet/aspnetcore/pull/36328) is the PR where we updated our TFM to `net7.0`. This step can be tricky - we have workarounds in [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in) to make the build work before we get an SDK containing runtime references with the new TFM. We copy the `KnownFrameworkReference`, `KnownRuntimePack`, and `KnownAppHostPack` from the previous TFM, give them the incoming runtime dependency versions, and give them the new TFM (these TFMs no-op most of the time - they only apply during this period when we're using an SDK that doesn't know about the new TFM). These workarounds allow us to build against the new TFM before we get an SDK with a reference to it, but there are often problems that arise in this area. The best way to debug build errors related to FrameworkReferences it to get a binlog of a failing project (`dotnet build /bl`) and look at the inputs to the task that failed. Confirm that the `Known___` items look as expected (there is an entry with the current TFM & the current dotnet/runtime dependency version), and look at the source code of the task in [dotnet/sdk](https://github.com/dotnet/sdk) for hints. ### Required changes * In [eng/Versions.props](/eng/Versions.props), increment `DefaultNetCoreTargetFramework` by 1. +* In [eng/SourceBuild.props](/eng/SourceBuild.props), update `SourceBuildTargetFrameworkFilter` to include the current TFM. * Do a global repo search for the current version string, and update almost everything by 1 (e.g. find `net8`, replace with `net9`). See the PR linked above for examples - this shouldn't be done blindly, but on a case-by-case basis. Most things should be updated, and most choices should be obvious. * Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj) and [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`. * Add a reference to the new `SiteExtensions` package for the previous Major Version. diff --git a/eng/BeforeTargetFrameworkInference.targets b/eng/BeforeTargetFrameworkInference.targets new file mode 100644 index 000000000000..44ec4ac3a110 --- /dev/null +++ b/eng/BeforeTargetFrameworkInference.targets @@ -0,0 +1,6 @@ + + + + 99.9 + + \ No newline at end of file diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index a3886b980173..d83a2564b43f 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -5,6 +5,7 @@ aspnetcore true + netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0 - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0371c189f5e7..e140e6d64314 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,324 +9,324 @@ --> - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/efcore - 8f52c86d7a31810711e3fa4c56a970bc10a1b026 + 244821832fe84ba1bd4367a22db2b096246444b3 - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb https://github.com/dotnet/source-build-externals f379c3367804237751f13311b5dddbfafc86be40 - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb https://github.com/dotnet/xdt @@ -356,16 +356,16 @@ https://github.com/dotnet/roslyn 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb - + https://github.com/dotnet/runtime - da3500bb02343b1d0424c74ccdddbc592b5b3f4f + fd20f42f1f4fa77a0facde02e0c1527fa26e95cb https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index eed5e50ce8c3..ade7900939e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ src\Components\WebAssembly\Sdk\testassets\Directory.Build.props, and src\Razor\test\testassets\Directory.Build.props when this changes. --> - net8.0 + net9.0 @@ -64,91 +64,91 @@ --> - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 9.0.0-alpha.1.23467.2 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 - 8.0.0-rc.2.23457.7 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 + 9.0.0-alpha.1.23465.20 9.0.0-alpha.1.23460.2 9.0.0-alpha.1.23460.2 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 - 9.0.0-alpha.1.23421.9 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 + 9.0.0-alpha.1.23465.14 4.7.0-3.23314.3 4.7.0-3.23314.3 @@ -169,8 +169,8 @@ 9.0.0-alpha.1.23465.1 2.1.0-beta.23409.1 - - 8.0.0-rc.2.23457.7 + + 9.0.0-alpha.1.23467.2 7.0.0-preview.22423.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa74ab4a81e7..5cd6dfc3e2f9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 73ed73a32068..8505deedef8d 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -57,7 +57,7 @@ runtime - + $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) @@ -74,7 +74,7 @@ - diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index d5fb01366512..d6d239916bed 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -9,5 +9,12 @@ true true + + win + osx + linux + freebsd + x64 + $(TargetOsName)-$(TargetArchitecture) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index 8126b45f4e1c..ac81cd0cd333 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -12,6 +12,58 @@ + + + + + + + + + + $(MicrosoftNETCoreAppRuntimeVersion) + $(MicrosoftNETCoreAppRefVersion) + + $(MicrosoftNETCoreAppRuntimeVersion) + $(TargetRuntimeIdentifier) + + + + $(MicrosoftNETCoreAppRuntimeVersion) + $(TargetRuntimeIdentifier) + + + + $(MicrosoftNETCoreAppRuntimeVersion) + $(TargetRuntimeIdentifier) + + + 99.9 <_ExtraTrimmerArgs>{ExtraTrimmerArgs} $(_ExtraTrimmerArgs) {AdditionalProperties} @@ -18,5 +21,5 @@ {AdditionalProjectReferences} - + diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index d291a13924e5..1018b14a641b 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -85,6 +85,7 @@ .Replace('{RuntimeIdentifier}','%(TestConsoleApps.TestRuntimeIdentifier)') .Replace('{PublishAot}','$(IsNativeAotTestProject)') .Replace('{MicrosoftNETCoreAppRuntimeVersion}','$(MicrosoftNETCoreAppRuntimeVersion)') + .Replace('{MicrosoftNETCoreAppRefVersion}','$(MicrosoftNETCoreAppRefVersion)') .Replace('{RepoRoot}', '$(RepoRoot)') .Replace('{ExtraTrimmerArgs}', '%(TestConsoleApps.ExtraTrimmerArgs)') .Replace('{AdditionalProperties}', '$(_additionalPropertiesString)') diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index 973e544f2bd2..4ce5a0ade2e4 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -7,23 +7,38 @@ Condition=" '$(UpdateAspNetCoreKnownFramework)' == '' ">true - + + + + diff --git a/eng/tools/HelixTestRunner/HelixTestRunner.csproj b/eng/tools/HelixTestRunner/HelixTestRunner.csproj index ecb530a0d90c..d92adbe82b66 100644 --- a/eng/tools/HelixTestRunner/HelixTestRunner.csproj +++ b/eng/tools/HelixTestRunner/HelixTestRunner.csproj @@ -8,7 +8,7 @@ - net8.0 + net9.0 Exe $(NoWarn);CA2007;NU5104 diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index aa693e2131f6..f5f8e7d89353 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,6 +1,6 @@ - $(DefaultNetCoreTargetFramework) + net8.0 $(TargetFrameworks);net472 $(DefineConstants);BUILD_MSI_TASKS false @@ -22,7 +22,7 @@ - + diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index c5722a9e266d..4babab0764ef 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -1,6 +1,6 @@ - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework) + <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net8.0 <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472 <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Shipped.txt rename to src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Shipped.txt diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt rename to src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec index 626673597f4e..2ec67a3f538c 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in index a509538b85f4..f8e3bd9f0df2 100644 --- a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in +++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in @@ -1,6 +1,6 @@ { "runtimeOptions": { - "tfm": "net8.0", + "tfm": "net9.0", "framework": { "name": "Microsoft.AspNetCore.App", "version": "${SharedFxVersion}" diff --git a/src/Components/benchmarkapps/Wasm.Performance/local.dockerfile b/src/Components/benchmarkapps/Wasm.Performance/local.dockerfile index dc46d3038403..c2e1dcd10c5e 100644 --- a/src/Components/benchmarkapps/Wasm.Performance/local.dockerfile +++ b/src/Components/benchmarkapps/Wasm.Performance/local.dockerfile @@ -3,7 +3,7 @@ FROM selenium/standalone-chrome:latest as final ENV StressRunDuration=0 WORKDIR /app -COPY ./Driver/bin/Release/net8.0/linux-x64/publish ./ +COPY ./Driver/bin/Release/net9.0/linux-x64/publish ./ COPY ./exec.sh ./ ENTRYPOINT [ "bash", "./exec.sh" ] diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs index 6d94b7041fa7..5183b085e101 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs @@ -153,7 +153,7 @@ public async Task RunsInIISExpressInProcess() var applicationName = "CreateDefaultBuilderApp"; var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - TargetFramework = "net8.0", + TargetFramework = "net9.0", HostingModel = HostingModel.InProcess }; @@ -208,7 +208,7 @@ private async Task ExecuteTestApp(string applicationName, { var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitectures.Current) { - TargetFramework = "net8.0", + TargetFramework = "net9.0", }; if (setTestEnvVars) diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec index 6dd862377631..dd3bb5c6e72e 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec index 6056e1a3ef05..2b341ad296d5 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/Framework/App.Ref/src/CompatibilitySuppressions.xml b/src/Framework/App.Ref/src/CompatibilitySuppressions.xml index 4200e67a8fb1..5fd58d407c27 100644 --- a/src/Framework/App.Ref/src/CompatibilitySuppressions.xml +++ b/src/Framework/App.Ref/src/CompatibilitySuppressions.xml @@ -3,6 +3,6 @@ PKV004 - net8.0 + net9.0 \ No newline at end of file diff --git a/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml b/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml index 1e3c24f64465..044b90f8b6da 100644 --- a/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml +++ b/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml @@ -3,6 +3,6 @@ PKV0001 - net8.0 + net9.0 \ No newline at end of file diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs index 623ad13e3ab1..c5ddaf7067f1 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs +++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs @@ -54,11 +54,11 @@ internal static ReferenceAssemblies GetReferenceAssemblies() "NuGet.config") : Path.Combine(TestData.GetRepoRoot(), "NuGet.config"); var net8Ref = new ReferenceAssemblies( - "net8.0", + "net9.0", new PackageIdentity( "Microsoft.NETCore.App.Ref", TestData.GetMicrosoftNETCoreAppRefPackageVersion()), - Path.Combine("ref", "net8.0")) + Path.Combine("ref", "net9.0")) .WithNuGetConfigFilePath(nugetConfigPath); return net8Ref.AddAssemblies(ImmutableArray.Create( diff --git a/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs b/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs index 55581515e563..3df9f24e0dcb 100644 --- a/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs +++ b/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs @@ -15,7 +15,8 @@ public static class Tfm public const string Net60 = "net6.0"; public const string Net70 = "net7.0"; public const string Net80 = "net8.0"; - public const string Default = Net80; + public const string Net90 = "net9.0"; + public const string Default = Net90; public static bool Matches(string tfm1, string tfm2) { diff --git a/src/Http/samples/MinimalSampleFSharp/MinimalSampleFSharp.fsproj b/src/Http/samples/MinimalSampleFSharp/MinimalSampleFSharp.fsproj index 0008d19d906e..2901809c4ac8 100644 --- a/src/Http/samples/MinimalSampleFSharp/MinimalSampleFSharp.fsproj +++ b/src/Http/samples/MinimalSampleFSharp/MinimalSampleFSharp.fsproj @@ -1,7 +1,7 @@ - net8.0 + $(DefaultNetCoreTargetFramework) diff --git a/src/Middleware/OutputCaching/perf/Microbenchmarks/Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj b/src/Middleware/OutputCaching/perf/Microbenchmarks/Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj index 419f60a6c948..4e4a6e747acd 100644 --- a/src/Middleware/OutputCaching/perf/Microbenchmarks/Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj +++ b/src/Middleware/OutputCaching/perf/Microbenchmarks/Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + $(DefaultNetCoreTargetFramework) enable true $(DefineConstants);IS_BENCHMARKS diff --git a/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json b/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json index b714e2a18d45..4ccd32c4500c 100644 --- a/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json +++ b/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json @@ -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/net8.0/OutputCachingSample.dll", + "program": "${workspaceFolder}/bin/Debug/net9.0/OutputCachingSample.dll", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs index 1d57792d4c44..57468bf4ee71 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs +++ b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs @@ -135,7 +135,7 @@ public async Task DeployTestAndAddToSpec(ServerType server, bool ssl, string env { Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp), ApplicationType = ApplicationType.Portable, - TargetFramework = "Net8.0", + TargetFramework = "Net9.0", EnvironmentName = environment, SiteName = "HttpTestSite", // This is configured in the Http.config ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null, diff --git a/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets index 9109012fcf5c..77f1bd087290 100644 --- a/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets +++ b/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets @@ -1,3 +1,3 @@ - + diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json index 861e3c895469..553721b9ecd2 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json @@ -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": "9800", - "identity": "Microsoft.DotNet.Web.ClientItems.Less.8.0", + "precedence": "9900", + "identity": "Microsoft.DotNet.Web.ClientItems.Less.9.0", "shortName": "less", "sourceName": "styleSheet1", "tags": { diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json index 2f2b09a5f2ab..75dc92667da1 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json @@ -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": "9800", - "identity": "Microsoft.DotNet.Web.ClientItems.Scss.8.0", + "precedence": "9900", + "identity": "Microsoft.DotNet.Web.ClientItems.Scss.9.0", "shortName": "scss", "sourceName": "styleSheet1", "tags": { diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json index ed950d41a250..e6ce0706473c 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json @@ -6,8 +6,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A blank TypeScript source file", "groupIdentity": "Microsoft.DotNet.Web.ClientItems.TypeScript", - "precedence": "9800", - "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.8.0", + "precedence": "9900", + "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.9.0", "shortName": "tsfile", "sourceName": "file1", "tags": { diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json index 4f775477702c..98431be38eaf 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.ApiController", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Mvc.ApiController.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Mvc.ApiController.9.0", "shortName": "apicontroller", "sourceName": "ValueController", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json index 44dddb65d8b6..d57839a7e15e 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.MvcController", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Mvc.MvcController.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Mvc.MvcController.9.0", "shortName": "mvccontroller", "sourceName": "HomeController", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json index e732b9cce977..e8491b1d298c 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json @@ -13,8 +13,8 @@ "type": "item" }, "groupIdentity": "Microsoft.Web.Grpc.Protobuf", - "precedence": "9800", - "identity": "Microsoft.Web.Grpc.Protobuf.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.Grpc.Protobuf.9.0", "shortname": "proto", "sourceName": "protobuf", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json index 0f2b658ad91b..60b18df1720b 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json @@ -13,8 +13,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Components.RazorComponent", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Components.RazorComponent.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Components.RazorComponent.9.0", "shortname": "razorcomponent", "sourceName": "Component1", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json index fb71f675463b..e57b0e304087 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorPage", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Mvc.RazorPage.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Mvc.RazorPage.9.0", "shortName": "page", "sourceName": "Index", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json index 6ef941327fcd..37f413805913 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorView", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Mvc.RazorView.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Mvc.RazorView.9.0", "shortName": "view", "sourceName": "Index", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json index f14f28465220..e0063aa3f51a 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewImports", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Mvc.ViewImports.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Mvc.ViewImports.9.0", "shortName": "viewimports", "sourceName": "ignoreme", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json index 4e7e9944494b..56b5cb845ed1 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewStart", - "precedence": "9800", - "identity": "Microsoft.AspNetCore.Mvc.ViewStart.8.0", + "precedence": "9900", + "identity": "Microsoft.AspNetCore.Mvc.ViewStart.9.0", "shortName": "viewstart", "sourceName": "ignoreme", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json index 971eb62028ba..525989d38e39 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json @@ -10,14 +10,14 @@ "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": "9800", + "precedence": "9900", "guids": [ "4C26868E-5E7C-458D-82E3-040509D0C71F", "5990939C-7E7B-4CFA-86FF-44CA5756498A", "650B3CE7-2E93-4CC4-9F46-466686815EAA" ], - "identity": "Microsoft.Web.Blazor.CSharp.8.0", - "thirdPartyNotices": "https://aka.ms/aspnetcore/8.0-third-party-notices", + "identity": "Microsoft.Web.Blazor.CSharp.9.0", + "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", "preferNameDirectory": true, "primaryOutputs": [ { @@ -119,12 +119,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json index c3caf90c3680..5fed4a29c7c9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json @@ -11,7 +11,7 @@ "defaultName": "BlazorApp", "description": "A project template for creating a Blazor app that runs on WebAssembly. This template can be used for web apps with rich dynamic user interfaces (UIs).", "groupIdentity": "Microsoft.Web.Blazor.Wasm", - "precedence": "9800", + "precedence": "9900", "guids": [ "4C26868E-5E7C-458D-82E3-040509D0C71F", "5990939C-7E7B-4CFA-86FF-44CA5756498A", @@ -20,8 +20,8 @@ "09732173-2cef-46b7-83db-1334bcb079d3", // Tenant ID "53bc9b9d-9d6a-45d4-8429-2a2761773502" // Client ID ], - "identity": "Microsoft.Web.Blazor.Wasm.CSharp.8.0", - "thirdPartyNotices": "https://aka.ms/aspnetcore/8.0-third-party-notices", + "identity": "Microsoft.Web.Blazor.Wasm.CSharp.9.0", + "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", "preferNameDirectory": true, "primaryOutputs": [ { @@ -142,12 +142,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json index a8e04bd839a5..af573b9d5589 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json @@ -9,8 +9,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", - "precedence": "9800", - "identity": "Microsoft.Web.Empty.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.Empty.CSharp.9.0", "shortName": "web", "tags": { "language": "C#", @@ -145,12 +145,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json index a5cbb2757d53..306cd23c02ed 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json @@ -8,8 +8,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", - "precedence": "9800", - "identity": "Microsoft.Web.Empty.FSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.Empty.FSharp.9.0", "shortName": "web", "tags": { "language": "F#", @@ -126,12 +126,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json index 10524feaf3aa..222434541d08 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating a gRPC service using ASP.NET Core, with optional support for publishing as native AOT.", "groupIdentity": "Microsoft.Web.Grpc", - "precedence": "9800", - "identity": "Microsoft.Grpc.Service.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Grpc.Service.CSharp.9.0", "shortName": "grpc", "tags": { "language": "C#", @@ -58,11 +58,11 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "defaultValue": "net8.0" + "defaultValue": "net9.0" }, "ExcludeLaunchSettings": { "type": "parameter", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json index a41edcc0235f..8897a8d519e8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project for creating a Razor class library that targets .NET", "groupIdentity": "Microsoft.Web.Razor", - "precedence": "9800", - "identity": "Microsoft.Web.Razor.Library.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.Razor.Library.CSharp.9.0", "shortName": "razorclasslib", "tags": { "language": "C#", @@ -48,11 +48,11 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "defaultValue": "net8.0" + "defaultValue": "net9.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 55b87ecde260..60634448f239 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -10,13 +10,13 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core Razor Pages content", "groupIdentity": "Microsoft.Web.RazorPages", - "precedence": "9800", - "identity": "Microsoft.Web.RazorPages.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.RazorPages.CSharp.9.0", "shortName": [ "webapp", "razor" ], - "thirdPartyNotices": "https://aka.ms/aspnetcore/8.0-third-party-notices", + "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", "tags": { "language": "C#", "type": "project" @@ -384,12 +384,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index 93051d2b5188..c5dc29ee0152 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -9,10 +9,10 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", - "precedence": "9800", - "identity": "Microsoft.Web.Mvc.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.Mvc.CSharp.9.0", "shortName": "mvc", - "thirdPartyNotices": "https://aka.ms/aspnetcore/8.0-third-party-notices", + "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", "tags": { "language": "C#", "type": "project" @@ -374,12 +374,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json index 914eaca5aa97..1bd07aedd39d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json @@ -9,10 +9,10 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", - "precedence": "9800", - "identity": "Microsoft.Web.Mvc.FSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.Mvc.FSharp.9.0", "shortName": "mvc", - "thirdPartyNotices": "https://aka.ms/aspnetcore/8.0-third-party-notices", + "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", "tags": { "language": "F#", "type": "project" @@ -131,12 +131,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json index 82af2f113586..caf42e0bab4a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating a RESTful Web API using ASP.NET Core controllers or minimal APIs, with optional support for OpenAPI and authentication.", "groupIdentity": "Microsoft.Web.WebApi", - "precedence": "9800", - "identity": "Microsoft.Web.WebApi.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.WebApi.CSharp.9.0", "shortName": "webapi", "tags": { "language": "C#", @@ -326,12 +326,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index f0548896f0f7..87b2fbc2faf6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -8,8 +8,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.", "groupIdentity": "Microsoft.Web.WebApi", - "precedence": "9800", - "identity": "Microsoft.Web.WebApi.FSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.WebApi.FSharp.9.0", "shortName": "webapi", "tags": { "language": "F#", @@ -126,12 +126,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json index 0d45ec24446e..e67961595430 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating a RESTful Web API using ASP.NET Core minimal APIs published as native AOT.", "groupIdentity": "Microsoft.Web.WebApiAot", - "precedence": "9000", - "identity": "Microsoft.Web.WebApiAot.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Web.WebApiAot.CSharp.9.0", "shortName": "webapiaot", "tags": { "language": "C#", @@ -103,12 +103,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json index 7398d8dc42df..fbf14b270d6f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating a worker service.", "groupIdentity": "Microsoft.Worker.Empty", - "precedence": "9800", - "identity": "Microsoft.Worker.Empty.CSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Worker.Empty.CSharp.9.0", "shortName": "worker", "tags": { "language": "C#", @@ -62,12 +62,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json index 5b5f7e07d434..376fe10febc4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating a worker service.", "groupIdentity": "Microsoft.Worker.Empty", - "precedence": "9800", - "identity": "Microsoft.Worker.Empty.FSharp.8.0", + "precedence": "9900", + "identity": "Microsoft.Worker.Empty.FSharp.9.0", "shortName": "worker", "tags": { "language": "F#", @@ -47,12 +47,12 @@ "datatype": "choice", "choices": [ { - "choice": "net8.0", - "description": "Target net8.0" + "choice": "net9.0", + "description": "Target net9.0" } ], - "replaces": "net8.0", - "defaultValue": "net8.0" + "replaces": "net9.0", + "defaultValue": "net9.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 index 2b0f8236e88a..30f35b9fc877 100644 --- a/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 @@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "blazorwasm" "blazorwasm --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $true +Test-Template "blazorwasm" "blazorwasm --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 index a4e4e360addc..8a32a0a399c4 100644 --- a/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 @@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "blazorwasm" "blazorwasm --use-program-main --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $true +Test-Template "blazorwasm" "blazorwasm --use-program-main --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 index 75fc66605f99..4ae051d00dbf 100644 --- a/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 @@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "MyBlazorApp" "blazor" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $true +Test-Template "MyBlazorApp" "blazor" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 index 3a7607863305..e938b8498d9b 100644 --- a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 index 6a20bf49489a..cf966878f2a2 100644 --- a/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "web" "web --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "web" "web --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 index f017eacafc8d..d43afebf1f96 100644 --- a/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "grpc" "grpc -aot" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "grpc" "grpc -aot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 index 81ad557a86ca..b75dcf2bbb27 100644 --- a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 index 6a63b579a12b..12d9f00fec4d 100644 --- a/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapp" "webapp -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapp" "webapp -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 index 1e37fa976fa2..0cb529d15758 100644 --- a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 index 17396806d9f1..ab438f0aee18 100644 --- a/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "mvc" "mvc -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "mvc" "mvc -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 index 27c064433eae..3dfb1fa512c5 100644 --- a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 index 955fb4b9c16e..ddff4253d418 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapiaot" "webapiaot" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapiaot" "webapiaot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 index 73ef00aabbc1..556b07f3c5ee 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapiaot" "webapiaot --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapiaot" "webapiaot --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 index feee0afcb44f..336a48339996 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapimin" "webapi -minimal" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapimin" "webapi -minimal" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 index fb3565c9c6d9..da6595100039 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapi" "webapi --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapi" "webapi --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 index 63fa1e8ae9d1..72f9c1c1568a 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapi" "webapi --use-program-main --use-minimal-apis" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "webapi" "webapi --use-program-main --use-minimal-apis" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 index b2320d5adfe8..538c7d8e1d7c 100644 --- a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 index 811889c3fa89..c86024ad16e9 100644 --- a/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker -aot" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "worker" "worker -aot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 index fa9119dea0bd..c2d16ddaa02f 100644 --- a/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "worker" "worker --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 index 9d8c5bffdcb8..391eb8fc6638 100644 --- a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.8.0.8.0.0-dev.nupkg" $false +Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Test-Template.ps1 b/src/ProjectTemplates/scripts/Test-Template.ps1 index fa06ad55a2a5..1ad286adbd88 100644 --- a/src/ProjectTemplates/scripts/Test-Template.ps1 +++ b/src/ProjectTemplates/scripts/Test-Template.ps1 @@ -47,10 +47,10 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isBlazorWa foreach ($projPath in $proj) { $projContent = Get-Content -Path $projPath -Raw if ($isBlazorWasmHosted) { - $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net8.0/TestTemplates" + $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net9.0/TestTemplates" } else { - $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net8.0/TestTemplates" + $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net9.0/TestTemplates" } $projContent = $projContent -replace ('(?:)', (' diff --git a/src/Security/Authorization/Core/src/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Security/Authorization/Core/src/PublicAPI/net8.0/PublicAPI.Shipped.txt rename to src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Shipped.txt diff --git a/src/Security/Authorization/Core/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Security/Authorization/Core/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt rename to src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Servers/Connections.Abstractions/src/PublicAPI/net8.0/PublicAPI.Shipped.txt rename to src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Shipped.txt diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Servers/Connections.Abstractions/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt rename to src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt diff --git a/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj b/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj index f564b414cfa2..7b5bfa5941a2 100644 --- a/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj +++ b/src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj @@ -7,6 +7,8 @@ true false $(DefineConstants);IS_BENCHMARKS + + true diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs index f13a4a7e6fd4..1e492b73b778 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs @@ -395,6 +395,7 @@ static async Task SendRequestAsync(HttpProtocols protocol, [ConditionalFact] [MsQuicSupported] + [SkipOnCI("https://github.com/dotnet/aspnetcore/issues/50833")] public async Task POST_ServerCompletesWithoutReadingRequestBody_ClientGetsResponse() { // Arrange @@ -699,6 +700,7 @@ public async Task GET_ServerAbort_ClientReceivesAbort(HttpProtocols protocol) [ConditionalFact] [MsQuicSupported] + [SkipOnCI("https://github.com/dotnet/aspnetcore/issues/50833")] public async Task POST_Expect100Continue_Get100Continue() { // Arrange @@ -958,7 +960,7 @@ await ServerRetryHelper.BindPortsWithRetry(async port => [ConditionalTheory] [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/38008")] [MsQuicSupported] - [InlineData(HttpProtocols.Http3)] + //[InlineData(HttpProtocols.Http3)] Skip: see https://github.com/dotnet/aspnetcore/issues/50833 [InlineData(HttpProtocols.Http2)] public async Task POST_ClientCancellationBidirectional_RequestAbortRaised(HttpProtocols protocol) { @@ -1059,7 +1061,7 @@ public async Task POST_ClientCancellationBidirectional_RequestAbortRaised(HttpPr // Verify HTTP/2 and HTTP/3 match behavior [ConditionalTheory] [MsQuicSupported] - [InlineData(HttpProtocols.Http3)] + //[InlineData(HttpProtocols.Http3)] Skip: see https://github.com/dotnet/aspnetcore/issues/50833 [InlineData(HttpProtocols.Http2)] public async Task POST_Bidirectional_LargeData_Cancellation_Error(HttpProtocols protocol) { diff --git a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs index eaaeace4aa42..892a7ac124a2 100644 --- a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs @@ -42,6 +42,8 @@ public DefaultCoreConfig() .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net7.0", null, ".NET Core 7.0"))) #elif NET8_0 .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net8.0", null, ".NET Core 8.0"))) +#elif NET9_0 + .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net9.0", null, ".NET Core 9.0"))) #else #error Target frameworks need to be updated. #endif diff --git a/src/Shared/ErrorPage/GeneratePage.ps1 b/src/Shared/ErrorPage/GeneratePage.ps1 index c307ba6c69ad..6e9e51d0618c 100644 --- a/src/Shared/ErrorPage/GeneratePage.ps1 +++ b/src/Shared/ErrorPage/GeneratePage.ps1 @@ -1,5 +1,5 @@ $RepoRoot = Resolve-Path "$PSScriptRoot\..\..\.." -$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net8.0\dotnet-razorpagegenerator.exe" +$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net9.0\dotnet-razorpagegenerator.exe" if (!(Test-Path "$ToolPath")) { throw "Unable to find razor page generator tool at $ToolPath" diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index 6f0f49d3e1ee..2fa20dcd295e 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -232,7 +232,7 @@ function runJest(httpsUrl: string, httpUrl: string) { (async () => { try { - const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net8.0", "SignalR.Client.FunctionalTestApp.dll"); + const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net9.0", "SignalR.Client.FunctionalTestApp.dll"); debug(`Launching Functional Test Server: ${serverPath}`); let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0"; diff --git a/src/SignalR/common/SignalR.Common/src/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Shipped.txt similarity index 100% rename from src/SignalR/common/SignalR.Common/src/PublicAPI/net8.0/PublicAPI.Shipped.txt rename to src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Shipped.txt diff --git a/src/SignalR/common/SignalR.Common/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/SignalR/common/SignalR.Common/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt rename to src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1 index 851fec870556..3247f288225c 100644 --- a/src/SignalR/publish-apps.ps1 +++ b/src/SignalR/publish-apps.ps1 @@ -1,4 +1,4 @@ -param($RootDirectory = (Get-Location), $Framework = "net8.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber) +param($RootDirectory = (Get-Location), $Framework = "net9.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber) # De-Powershell the path $RootDirectory = (Convert-Path $RootDirectory) diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs index 8ebb5794e595..f74b1a4f3ffd 100644 --- a/src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs +++ b/src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs @@ -5,12 +5,14 @@ using System.Linq; using System.Reflection; using Microsoft.AspNetCore.Internal; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.Tools.Internal; using Xunit.Abstractions; namespace Microsoft.Extensions.ApiDescription.Client; +[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/50662")] public class TargetTest : IDisposable { private static Assembly _assembly = typeof(TargetTest).Assembly; diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec index be5d875fb7aa..043c70902c70 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec @@ -12,6 +12,6 @@ - + diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs index 943312a42aad..696e714410b7 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs @@ -17,7 +17,7 @@ public class OpenApiTestBase : IDisposable protected readonly TextWriter _output = new StringWriter(); protected readonly TextWriter _error = new StringWriter(); protected readonly ITestOutputHelper _outputHelper; - protected const string TestTFM = "net8.0"; + protected const string TestTFM = "net9.0"; protected const string Content = @"{""x-generator"": ""NSwag""}"; protected const string ActualUrl = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/api-with-examples.yaml"; diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs index 7f90c961db14..7f0ecd7026d9 100644 --- a/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs +++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs @@ -17,7 +17,7 @@ public class UserJwtsTestFixture : IDisposable private const string ProjectTemplate = @" Exe - net8.0 + net9.0 {0} false diff --git a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs index 3a85ab35c50d..cbaae483a57c 100644 --- a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs +++ b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs @@ -36,7 +36,7 @@ public string GetTempSecretProject() private const string ProjectTemplate = @" Exe - net8.0 + net9.0 {0} false diff --git a/startvscode.cmd b/startvscode.cmd index 7ad5e3a9e380..3f30981baa6c 100644 --- a/startvscode.cmd +++ b/startvscode.cmd @@ -14,7 +14,7 @@ SET DOTNET_MULTILEVEL_LOOKUP=0 SET PATH=%DOTNET_ROOT%;%PATH% :: Sets TFW for Visual Studio Code usage -SET TARGET=net8.0 +SET TARGET=net9.0 SET folder=%~1 diff --git a/startvscode.sh b/startvscode.sh index 09f1b8672b5b..57efea9d128c 100755 --- a/startvscode.sh +++ b/startvscode.sh @@ -13,7 +13,7 @@ export DOTNET_MULTILEVEL_LOOKUP=0 export PATH="$DOTNET_ROOT:$PATH" # Sets TFW for Visual Studio Code usage -export TARGET=net8.0 +export TARGET=net9.0 if [ ! -f "$DOTNET_ROOT/dotnet" ]; then echo ".NET Core has not yet been installed. Run `./restore.sh` to install tools."