dotnet
/
aspnetcore
зеркало из https://github.com/dotnet/aspnetcore.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[master] Update dependencies from dotnet/runtime dotnet/efcore (#26788) 

[master] Update dependencies from dotnet/runtime dotnet/efcore


 - Update TFM net5.0 -> net6.0

 - Introduce $(TargetTFM)

 - TargetTfm -> DefaultNetCoreTargetFramework

 - Updated: NETCoreAppMaximumVersion

 - Apply suggestions from code review

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>

 - Fix version numbers used in Blazor WASM SDK

 - Address feedback from peer review

 - Fix check for platform version

 - Fix build config for dotnet-watch project

 - Update TFM net5.0 -> net6.0

 - Introduce $(TargetTFM)

 - TargetTfm -> DefaultNetCoreTargetFramework

 - Apply suggestions from code review

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>

 - Fix version numbers used in Blazor WASM SDK

 - Address feedback from peer review

 - Remove workaround in dotnet-watch tests

 - Testrunner to 5.0 and adding workarounds

 - Try props.in

 - net50

 - Fixup KnownFrameworkReference for integration tests

 - Resolve a few comments
- don't use repo-specific properties in shipping file
- pass `$(DefaultNetCoreTargetFramework)` into template files used in tests

 - Update src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets

 - Update KnownFrameworkReference for template tests

 - Use DefaultNetcoreTFM

 - Undo change to props.in

 - Update src/ProjectTemplates/test/ProjectTemplates.Tests.csproj

 - Update GenerateTestProps.targets

- this is where `$(KnownAppHostPackOrFrameworkReferenceTfm)` is needed

 - Update src/ProjectTemplates/test/ProjectTemplates.Tests.csproj

- additional template input not needed here

 - Other file changes

 - Rename the one net5.0 directory in the repo

 - Fixup rebase remnants

 - Use runtime and ref/ assemblies matching repo in Helix testing
- add Directory.Build.*.in files based on project template test infrastructure
- use files as import boundary where the project doesn't create its own Directory.Build.* files
- ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies

 - Switch Directory.Build.*.in files in Helix content
- ensure item manipulation is done after base items exist

nit: Fix *.in exclusion

 - Update TFM workaround to reference 5.0 instead of 3.1 (#26991)

 - Make some Directory.Build.*.in settings override-able
- that is, move some properties to Directory.Build.props.in

also
- fix `Condition`s that resulted in empty Directory.Build.targets
- separate Directory.Build.empty.in
- ensure RunTests project is _not_ affected by root Directory.Build.* files

 - Update SDK

 - Set `$(DefaultNetCoreTargetFramework)` in Helix root Directory.Build.props
= `dotnet-watch` tests otherwise fail with "The TargetFramework value '' was not recognized"

 - Extend Helix Directory.Build.* workarounds
- generate Directory.Build.* files when restoring any projects
- include generated files in Helix runs needing the latest runtime
- copy generated files when testing `dotnet-watch` locally
- include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets
  - remove duplicate settings from existing Directory.Build.* files
- ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore

 - !fixup! Remove extra end tags

 - !fixup! Don't build GenerateFiles.csproj in desktop `msbuild`

 - !fixup! Arcade uses different test targets

 - Disable `crossgen` when building for Helix runs
- make `$(CrossgenOutput)` property override-able
- use override in CI jobs that submit to other platforms
  - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian)

nits:
- correct condition for `$(GenerateCrossgenProfilingSymbols)`
- set `$(ASPNETCORE_TEST_LOG_DIR)` in every step of the Helix build jobs

 - Ensure ReadRequest type can be loaded on server. Fixes #26882 (#26931)

 - Enable debugging when using embedded PDBs (#27107)

* Fix debug using embedded PDBs.

* Check for either debugBuild or referenced PDBs

Co-authored-by: Thays <thaystg@gmail.com>

 - Ensure Blazor JS files are up-to-date

 - Merge branch 'master' into darc-master-76e24f4d-c90c-42ac-a1e5-411ae61ca37b
This commit is contained in:
dotnet-maestro[bot] 2020-10-27 07:04:33 +00:00 коммит произвёл GitHub
Родитель 062237e054
Коммит 219ecd6880
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
120 изменённых файлов: 676 добавлений и 452 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
.azure/pipelines/ci.yml
Просмотреть файл

@ -709,13 +709,15 @@ stages:
timeoutInMinutes: 240
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
- script: ./build.cmd -ci -nobl -all -pack -arch x64
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj $(_InternalRuntimeDownloadArgs)
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
displayName: Restore interop projects
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true $(_InternalRuntimeDownloadArgs)
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
displayName: Run build.cmd helix target
env:
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

4
.azure/pipelines/helix-matrix.yml
Просмотреть файл

@ -27,12 +27,14 @@ jobs:
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Restore interop projects
- script: .\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true
/p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Run build.cmd helix target
env:
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

7
.azure/pipelines/quarantined-pr.yml
Просмотреть файл

@ -31,13 +31,16 @@ jobs:
timeoutInMinutes: 120
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
- script: ./build.cmd -ci -nobl -all -pack -arch x64
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Restore interop projects
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
/p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:BuildInteropProjects=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Run build.cmd helix target
continueOnError: true
env:

9
.azure/pipelines/quarantined-tests.yml
Просмотреть файл

@ -28,13 +28,16 @@ jobs:
timeoutInMinutes: 480
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
- script: ./build.cmd -ci -nobl -all -pack -arch x64
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Restore interop projects
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-projects eng\helix\helix.proj /p:IsHelixDaily=true /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
/p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
-projects eng\helix\helix.proj /p:IsHelixDaily=true /p:RunQuarantinedTests=true /p:IsRequiredCheck=true
/p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Run build.cmd helix target
continueOnError: true
env:

29
eng/Tools.props
Просмотреть файл

@ -1,14 +1,25 @@
<Project>
<ItemGroup>
<ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
<!--
This is here to workaround flakiness in the NuGet SDK resolver in MSBuild.
Arcade will run a pre-restore for these packages. This works more consistently than the SDK resolution which uses global.json.
Without this here, we see regular failures with 'error MSB4236: The SDK 'Yarn.MSBuild' specified could not be found.'
Since this project is evaluated before .npmproj files are loaded, this should cause the package to end
up in the NuGet cache ahead of time.
This is not needed in source build.
This is here to workaround flakiness in the NuGet SDK resolver in MSBuild. Arcade will run a pre-restore for
these packages. This works more consistently than the SDK resolution which uses global.json. Without this
here, we see regular failures with 'error MSB4236: The SDK 'Yarn.MSBuild' specified could not be found.'
Since this project is evaluated before .npmproj files are loaded, this should cause the package to end up in
the NuGet cache ahead of time. This is not needed in source build.
-->
<PackageReference Condition="'$(DotNetBuildFromSource)' != 'true'" Include="Yarn.MSBuild" Version="1.15.2" />
<PackageReference Include="Yarn.MSBuild" Version="1.15.2" />
</ItemGroup>
<!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
<Target Name="GenerateDirectoryBuildFiles"
AfterTargets="Restore"
Condition=" '$(DotNetBuildFromSource)' != 'true' AND '$(MSBuildRuntimeType)' == 'core' ">
<!-- Separate invocations and use different properties to ensure second can load the restored package info. -->
<MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
RemoveProperties="BaseIntermediateOutputPath"
Targets="Restore" />
<MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
RemoveProperties="BaseIntermediateOutputPath;ExcludeRestorePackageImports"
Targets="GenerateDirectoryBuildFiles" />
</Target>
</Project>

296
eng/Version.Details.xml
Просмотреть файл

@ -9,309 +9,309 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="dotnet-ef" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-alpha.1.20509.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-alpha.1.20526.2">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>3dc24353881e40f66718ad32472f6628955d80a9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Http" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Options" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Annotations" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.ComponentModel.Annotations" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices.Protocols" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.DirectoryServices.Protocols" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Drawing.Common" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.IO.Pipelines" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Net.Http.Json" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Net.Http.Json" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Net.Http.WinHttpHandler" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Net.Http.WinHttpHandler" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Reflection.Metadata" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
<Dependency Name="System.Security.AccessControl" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Security.AccessControl" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Security.Cryptography.Cng" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Security.Permissions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.ServiceProcess.ServiceController" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Text.Json" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Threading.Channels" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Threading.Channels" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20507.4">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20525.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20506.7">
<Uri>https://github.com/dotnet/arcade</Uri>

154
eng/Versions.props
Просмотреть файл

@ -35,9 +35,11 @@
<!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
<PreviousAspNetCoreReleaseVersion Condition=" '$(AspNetCorePatchVersion)' != '0' ">$(AspNetCoreMajorMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1))</PreviousAspNetCoreReleaseVersion>
<!--
Update the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
Update the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj,
src\Components\WebAssembly\Sdk\testassets\Directory.Build.props, and
src\Razor\test\testassets\Directory.Build.props when this changes.
-->
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
<DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
</PropertyGroup>
<PropertyGroup Label="Arcade settings">
<!-- Opt-in to Arcade tools for building VSIX projects. -->
@ -59,83 +61,83 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20507.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsCachingAbstractionsPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationBinderPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationBinderPackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
<MicrosoftExtensionsConfigurationIniPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationIniPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationXmlPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsConfigurationXmlPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersCompositePackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsFileProvidersCompositePackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingConfigurationPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingEventSourcePackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingEventSourcePackageVersion>
<MicrosoftExtensionsLoggingEventLogPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingEventLogPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsInternalTransportPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftExtensionsInternalTransportPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>6.0.0-alpha.1.20507.4</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-alpha.1.20507.4</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-alpha.1.20507.4</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesProtocolsPackageVersion>6.0.0-alpha.1.20507.4</SystemDirectoryServicesProtocolsPackageVersion>
<SystemDrawingCommonPackageVersion>6.0.0-alpha.1.20507.4</SystemDrawingCommonPackageVersion>
<SystemIOPipelinesPackageVersion>6.0.0-alpha.1.20507.4</SystemIOPipelinesPackageVersion>
<SystemNetHttpJsonPackageVersion>6.0.0-alpha.1.20507.4</SystemNetHttpJsonPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>6.0.0-alpha.1.20507.4</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>6.0.0-alpha.1.20507.4</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemReflectionMetadataPackageVersion>6.0.0-alpha.1.20507.4</SystemReflectionMetadataPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-alpha.1.20507.4</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0-alpha.1.20507.4</SystemRuntimeCompilerServicesUnsafePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20525.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsCachingAbstractionsPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationBinderPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationBinderPackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
<MicrosoftExtensionsConfigurationIniPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationIniPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationXmlPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsConfigurationXmlPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersCompositePackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsFileProvidersCompositePackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingConfigurationPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingEventSourcePackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingEventSourcePackageVersion>
<MicrosoftExtensionsLoggingEventLogPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingEventLogPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsInternalTransportPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftExtensionsInternalTransportPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>6.0.0-alpha.1.20525.3</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-alpha.1.20525.3</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-alpha.1.20525.3</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesProtocolsPackageVersion>6.0.0-alpha.1.20525.3</SystemDirectoryServicesProtocolsPackageVersion>
<SystemDrawingCommonPackageVersion>6.0.0-alpha.1.20525.3</SystemDrawingCommonPackageVersion>
<SystemIOPipelinesPackageVersion>6.0.0-alpha.1.20525.3</SystemIOPipelinesPackageVersion>
<SystemNetHttpJsonPackageVersion>6.0.0-alpha.1.20525.3</SystemNetHttpJsonPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>6.0.0-alpha.1.20525.3</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>6.0.0-alpha.1.20525.3</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemReflectionMetadataPackageVersion>6.0.0-alpha.1.20525.3</SystemReflectionMetadataPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-alpha.1.20525.3</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0-alpha.1.20525.3</SystemRuntimeCompilerServicesUnsafePackageVersion>
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
<SystemSecurityAccessControlPackageVersion>6.0.0-alpha.1.20507.4</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>6.0.0-alpha.1.20507.4</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.0-alpha.1.20507.4</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-alpha.1.20507.4</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-alpha.1.20507.4</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-alpha.1.20507.4</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>6.0.0-alpha.1.20507.4</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0-alpha.1.20507.4</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>6.0.0-alpha.1.20507.4</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>6.0.0-alpha.1.20507.4</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-alpha.1.20507.4</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-alpha.1.20525.3</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>6.0.0-alpha.1.20525.3</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.0-alpha.1.20525.3</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-alpha.1.20525.3</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-alpha.1.20525.3</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-alpha.1.20525.3</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>6.0.0-alpha.1.20525.3</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0-alpha.1.20525.3</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>6.0.0-alpha.1.20525.3</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>6.0.0-alpha.1.20525.3</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-alpha.1.20525.3</SystemWindowsExtensionsPackageVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-alpha.1.20507.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-alpha.1.20525.3</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>6.0.0-alpha.1.20509.5</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20509.5</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<dotnetefPackageVersion>6.0.0-alpha.1.20526.2</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20506.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>

4
eng/Workarounds.targets
Просмотреть файл

@ -1,8 +1,8 @@
<!-- Use this file to workaround issues. List the issue tracking the item to fix so we can remove the workaround when the issue is resolved. -->
<Project>
<!-- Workaround while there is no 5.0 SDK available, suppress unsupported version error -->
<!-- Workaround while there is no 6.0 SDK available, suppress unsupported version error -->
<PropertyGroup>
<NETCoreAppMaximumVersion>5.0</NETCoreAppMaximumVersion>
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
</PropertyGroup>
<ItemGroup>

10
eng/common/performance/performance-setup.ps1
Просмотреть файл

@ -3,7 +3,7 @@ Param(
[string] $CoreRootDirectory,
[string] $BaselineCoreRootDirectory,
[string] $Architecture="x64",
[string] $Framework="net5.0",
[string] $Framework="net6.0",
[string] $CompilationMode="Tiered",
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
[string] $Branch=$env:BUILD_SOURCEBRANCH,
@ -14,7 +14,7 @@ Param(
[string] $Kind="micro",
[switch] $LLVM,
[switch] $MonoInterpreter,
[switch] $MonoAOT,
[switch] $MonoAOT,
[switch] $Internal,
[switch] $Compare,
[string] $MonoDotnet="",
@ -36,7 +36,7 @@ $HelixSourcePrefix = "pr"
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net6.0")) {
$Queue = "Windows.10.Amd64.ClientRS5.Open"
}
@ -87,7 +87,7 @@ $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
if ($RunFromPerformanceRepo) {
$SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments"
robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git
}
else {
@ -144,4 +144,4 @@ Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $fal
Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false
Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false
exit 0
exit 0

6
eng/common/performance/performance-setup.sh
Просмотреть файл

@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory=
baseline_core_root_directory=
architecture=x64
framework=net5.0
framework=net6.0
compilation_mode=tiered
repository=$BUILD_REPOSITORY_NAME
branch=$BUILD_SOURCEBRANCH
@ -192,7 +192,7 @@ if [[ "$internal" == true ]]; then
helix_source_prefix="official"
creator=
extra_benchmark_dotnet_arguments=
if [[ "$architecture" = "arm64" ]]; then
queue=Ubuntu.1804.Arm64.Perf
else
@ -232,7 +232,7 @@ if [[ "$run_from_perf_repo" = true ]]; then
setup_arguments="--perf-hash $commit_sha $common_setup_arguments"
else
git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory
docs_directory=$performance_directory/docs
mv $docs_directory $workitem_directory
fi

1
eng/helix/content/Directory.Build.empty.in Normal file
Просмотреть файл

@ -0,0 +1 @@
<Project />

3
eng/helix/content/RunTests/Directory.Build.props
Просмотреть файл

@ -1,2 +1 @@
<Project>
</Project>
<Project />

3
eng/helix/content/RunTests/Directory.Build.targets
Просмотреть файл

@ -1,2 +1 @@
<Project>
</Project>
<Project />

7
eng/scripts/RunHelix.ps1
Просмотреть файл

@ -37,5 +37,10 @@ $env:BUILD_SOURCEBRANCH="local"
$env:BUILD_REPOSITORY_NAME="aspnetcore"
$env:SYSTEM_TEAMPROJECT="aspnetcore"
Write-Host -ForegroundColor Yellow "If running tests that need the shared Fx, run './build -pack -all' before this."
Write-Host -ForegroundColor Yellow "And if packing for a different platform, add '/p:CrossgenOutput=false'."
$HelixQueues = $HelixQueues -replace ";", "%3B"
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true `
/p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests `
/p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log

2
eng/targets/CSharp.Common.props
Просмотреть файл

@ -45,7 +45,7 @@
</ItemGroup>
<ImportGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
<Import Project="$(RepoRoot)src\Components\WebAssembly\Sdk\src\build\net5.0\Microsoft.NET.Sdk.BlazorWebAssembly.props" />
<Import Project="$(RepoRoot)src\Components\WebAssembly\Sdk\src\build\net6.0\Microsoft.NET.Sdk.BlazorWebAssembly.props" />
</ImportGroup>
<PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">

2
eng/targets/Helix.props
Просмотреть файл

@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
<HelixContent Include="$(RepoRoot)eng\helix\content\**\*" />
<HelixContent Include="$(RepoRoot)eng\helix\content\**\*" Exclude="$(RepoRoot)eng\helix\content\*.in" />
</ItemGroup>
</Project>

36
eng/targets/Helix.targets
Просмотреть файл

@ -116,6 +116,42 @@
<!-- Important: If HelixTargetQueue is not removed here, then Publish will occur for every single queue type. And since Publish shouldn't depend on the queue we can just publish once -->
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_PublishHelixArchive" RemoveProperties="HelixTargetQueue;TestRunId" />
<!-- Isolate Helix tests from whatever happens to be in a parent directory. -->
<Copy SourceFiles="$(RepoRoot)eng\helix\content\Directory.Build.empty.in"
DestinationFiles="$(PublishDir)Directory.Build.props"
Condition="! EXISTS('$(PublishDir)Directory.Build.props') AND '$(TestDependsOnAspNetRuntime)' != 'true'"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
Retries="$(CopyRetryCount)"
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
<Copy SourceFiles="$(RepoRoot)eng\helix\content\Directory.Build.empty.in"
DestinationFiles="$(PublishDir)Directory.Build.targets"
Condition="! EXISTS('$(PublishDir)Directory.Build.targets') AND '$(TestDependsOnAspNetRuntime)' != 'true'"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
Retries="$(CopyRetryCount)"
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
<!--
Use the shared framework and ref/ assemblies copied to the Helix agents and expanded by RunTests. Unfortunately,
tests of Microsoft.NET.Sdk.Web templates will not reference the just-built Microsoft.NET.Sdk.Razor. Adding a
package reference for that would confuse tests of Microsoft.NET.Sdk templates.
-->
<Copy SourceFiles="$(ArtifactsBinDir)GenerateFiles\Directory.Build.props"
DestinationFiles="$(PublishDir)Directory.Build.props"
Condition="! EXISTS('$(PublishDir)Directory.Build.props') AND '$(TestDependsOnAspNetRuntime)' == 'true'"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
Retries="$(CopyRetryCount)"
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
<Copy SourceFiles="$(ArtifactsBinDir)GenerateFiles\Directory.Build.targets"
DestinationFiles="$(PublishDir)Directory.Build.targets"
Condition="! EXISTS('$(PublishDir)Directory.Build.targets') AND '$(TestDependsOnAspNetRuntime)' == 'true'"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
Retries="$(CopyRetryCount)"
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
<ConvertToAbsolutePath Paths="$(PublishDir)">
<Output TaskParameter="AbsolutePaths" PropertyName="PublishAbsoluteDir" />
</ConvertToAbsolutePath>

7
eng/tools/GenerateFiles/Directory.Build.props.in Normal file
Просмотреть файл

@ -0,0 +1,7 @@
<Project>
<PropertyGroup>
<DefaultNetCoreTargetFramework>${DefaultNetCoreTargetFramework}</DefaultNetCoreTargetFramework>
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
</Project>

44
eng/tools/GenerateFiles/Directory.Build.targets.in Normal file
Просмотреть файл

@ -0,0 +1,44 @@
<Project>
<PropertyGroup>
<!-- Workaround while there is no SDK available that understands the TFM; suppress unsupported version errors. -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>
<ItemGroup>
<!-- Workaround when there is no vNext SDK available; copy known apphost/framework reference info from 5.0. -->
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="${KnownAppHostPackOrFrameworkReferenceTfm}"
Condition="@(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="${KnownAppHostPackOrFrameworkReferenceTfm}"
Condition="@(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))"
/>
</ItemGroup>
<ItemGroup>
<!-- Use the same NETCore shared framework as repo built against. -->
<KnownFrameworkReference
Update="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.NETCore.App')->WithMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}'))"
DefaultRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
TargetingPackVersion="${MicrosoftNETCoreAppRefPackageVersion}" />
<!-- Use the just-built ASP.NET Core shared framework. -->
<KnownFrameworkReference
Update="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->WithMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}'))"
DefaultRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
LatestRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
TargetingPackVersion="${MicrosoftAspNetCoreAppRefPackageVersion}"
RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" />
</ItemGroup>
<ItemGroup Condition="$(BuildingTestAppsIndependently) == 'false'">
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="${MicrosoftNetCompilersToolsetPackageVersion}"
PrivateAssets="all"
IsImplicitlyDefined="true" />
</ItemGroup>
</Project>

33
eng/tools/GenerateFiles/GenerateFiles.csproj Normal file
Просмотреть файл

@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>
<!-- Update artifacts/bin/GenerateFiles/Directory.Build.* files. -->
<Target Name="GenerateDirectoryBuildFiles">
<PropertyGroup>
<_TemplateProperties>
DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework);
KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm);
MicrosoftAspNetCoreAppRefPackageVersion=$(TargetingPackVersion);
MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion);
MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim())
</_TemplateProperties>
</PropertyGroup>
<MakeDir Directories="$(BaseOutputPath)" />
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(BaseOutputPath)Directory.Build.props" />
<GenerateFileFromTemplate TemplateFile="$(MSBuildProjectDirectory)\Directory.Build.props.in"
Properties="$(_TemplateProperties)"
OutputPath="$(BaseOutputPath)Directory.Build.props" />
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(BaseOutputPath)Directory.Build.targets" />
<GenerateFileFromTemplate TemplateFile="$(MSBuildProjectDirectory)\Directory.Build.targets.in"
Properties="$(_TemplateProperties)"
OutputPath="$(BaseOutputPath)Directory.Build.targets" />
</Target>
</Project>

1
eng/tools/RepoTasks/RepoTasks.csproj
Просмотреть файл

@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>

2
eng/tools/RepoTasks/RepoTasks.tasks
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net5.0</_RepoTaskAssemblyFolder>
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net6.0</_RepoTaskAssemblyFolder>
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
<_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
</PropertyGroup>

4
global.json
Просмотреть файл

@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.100-alpha.1.20472.11"
"version": "6.0.100-alpha.1.20523.3"
},
"tools": {
"dotnet": "6.0.100-alpha.1.20472.11",
"dotnet": "6.0.100-alpha.1.20523.3",
"runtimes": {
"dotnet/x64": [
"2.1.18",

2
src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".net5.0">
<group targetFramework=".net6.0">
<dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$componentAnalyzerPackageVersion$" />
<dependency id="Microsoft.AspNetCore.Authorization" version="$authorizationPackageVersion$" exclude="Build,Analyzers" />
</group>

2
src/Components/Ignitor/src/Ignitor.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<IsShippingPackage>false</IsShippingPackage>
<DefineConstants>$(DefineConstants);IGNITOR</DefineConstants>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

6
src/Components/Web.JS/dist/Release/blazor.server.js сгенерированный поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

2
src/Components/Web.JS/dist/Release/blazor.webassembly.js сгенерированный поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

20
src/Components/WebAssembly/Sdk/integrationtests/Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests.csproj
Просмотреть файл

@ -32,6 +32,18 @@
<Reference Include="Microsoft.NET.Sdk.Razor" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
</ItemGroup>
<!-- Ensure shared framework and targeting packs are laid out under .dotnet/ before executing non-Helix tests. -->
<ItemGroup Condition=" '$(ASPNETCORE_TEST_LOG_DIR)' == '' AND '$(IsHelixJob)' != 'true' ">
<ProjectReference Include="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
Condition=" $(IsTargetingPackBuilding) "
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" />
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
Condition=" !$(IsTargetingPackBuilding) "
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\src\BootJsonData.cs" LinkBase="Wasm" />
<Compile Include="..\src\AssetsManifestFile.cs" LinkBase="Wasm" />
@ -61,12 +73,8 @@
</ItemGroup>
</Target>
<Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
<MSBuild Projects="..\testassets\RestoreBlazorWasmTestProjects\RestoreBlazorWasmTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
</Target>
<Target Name="EnsureLogFolder" AfterTargets="Build">
<MakeDir Directories="$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfig)'))" />
<Target Name="RestoreTestProjects" BeforeTargets="RunTests;Test;VSTest" Condition="'$(DotNetBuildFromSource)' != 'true'">
<MSBuild Projects="..\testassets\RestoreBlazorWasmTestProjects\RestoreBlazorWasmTestProjects.csproj" Targets="Restore" />
</Target>
</Project>

2
src/Components/WebAssembly/Sdk/integrationtests/WasmBuildIntegrationTest.cs
Просмотреть файл

@ -281,7 +281,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
Assert.FileDoesNotExist(result, buildOutputDirectory, "wwwroot", "_framework", "_bin", "blazorwasm.dll");
var staticWebAssets = Assert.FileExists(result, buildOutputDirectory, "blazorhosted.StaticWebAssets.xml");
Assert.FileContains(result, staticWebAssets, Path.Combine("net5.0", "wwwroot"));
Assert.FileContains(result, staticWebAssets, Path.Combine("net6.0", "wwwroot"));
Assert.FileContains(result, staticWebAssets, Path.Combine("razorclasslibrary", "wwwroot"));
Assert.FileContains(result, staticWebAssets, Path.Combine("blazorwasm", "wwwroot"));
}

4
src/Components/WebAssembly/Sdk/src/Microsoft.NET.Sdk.BlazorWebAssembly.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".NET5.0" />
<group targetFramework=".NET6.0" />
</dependencies>
</metadata>
@ -12,7 +12,7 @@
<file src="Sdk\*" target="Sdk" />
<file src="build\**" target="build" />
<file src="targets\**" target="targets" />
<file src="_._" target="lib\net5.0\_._" />
<file src="_._" target="lib\net6.0\_._" />
<file src="$outputPath$\**" target="\" />
</files>

2
src/Components/WebAssembly/Sdk/src/build/net5.0/Microsoft.NET.Sdk.BlazorWebAssembly.props → src/Components/WebAssembly/Sdk/src/build/net6.0/Microsoft.NET.Sdk.BlazorWebAssembly.props
Просмотреть файл

@ -1,11 +1,9 @@
<!--
***********************************************************************************************
Microsoft.NET.Sdk.BlazorWebAssembly.props
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->

4
src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
Просмотреть файл

@ -33,10 +33,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
<BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net5.0</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net6.0</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net46</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tasks\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net5.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tools.dll</_BlazorWebAssemblySdkToolAssembly>
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net6.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tools.dll</_BlazorWebAssemblySdkToolAssembly>
</PropertyGroup>
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GenerateBlazorWebAssemblyBootJson" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />

18
src/Components/WebAssembly/Sdk/testassets/Directory.Build.props
Просмотреть файл

@ -1,6 +1,14 @@
<Project>
<Import Project="Before.Directory.Build.props" Condition="Exists('Before.Directory.Build.props')" />
<PropertyGroup>
<RepoRoot
Condition="'$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'AspNetCore.sln'))\</RepoRoot>
<ArtifactsBinDir
Condition="'$(ArtifactsBinDir)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin'))</ArtifactsBinDir>
</PropertyGroup>
<Import Project="$(ArtifactsBinDir)GenerateFiles\Directory.Build.props" />
<PropertyGroup>
<!--
In the case that a user is building a sample directly the MicrosoftNetCompilersToolsetPackagerVersion will not be provided.
@ -12,8 +20,6 @@
<!-- Do not resolve Reference ItemGroup since it has a different semantic meaning in Razor test apps -->
<EnableCustomReferenceResolution>false</EnableCustomReferenceResolution>
<RepoRoot Condition="'$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'AspNetCore.sln'))\</RepoRoot>
<RazorSdkCurrentVersionProps>$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
<RazorSdkCurrentVersionTargets>$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
<RazorSdkArtifactsDirectory>$(RepoRoot)artifacts\bin\Microsoft.NET.Sdk.Razor\</RazorSdkArtifactsDirectory>
@ -37,13 +43,5 @@
<_MvcAssemblyName Include="Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib" />
</ItemGroup>
<ItemGroup Condition="$(BuildingTestAppsIndependently) == 'false'">
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
PrivateAssets="all"
IsImplicitlyDefined="true" />
</ItemGroup>
<Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" />
</Project>

4
src/Components/WebAssembly/Sdk/testassets/Directory.Build.targets
Просмотреть файл

@ -1,7 +1,7 @@
<Project>
<Import Project="$(ArtifactsBinDir)GenerateFiles\Directory.Build.targets" />
<PropertyGroup>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">$(MicrosoftNETCoreAppRuntimeVersion)</RuntimeFrameworkVersion>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>
</Project>

2
src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/blazorwasm-minimal.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
<BlazorWebAssemblySdkDirectoryRoot>$(BlazorWebAssemblySdkArtifactsDirectory)$(Configuration)\sdk-output\</BlazorWebAssemblySdkDirectoryRoot>

2
src/Components/WebAssembly/Sdk/testassets/blazorwasm/blazorwasm.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
<BlazorWebAssemblySdkDirectoryRoot>$(BlazorWebAssemblySdkArtifactsDirectory)$(Configuration)\sdk-output\</BlazorWebAssemblySdkDirectoryRoot>

2
src/Components/WebAssembly/Sdk/tools/Microsoft.NET.Sdk.BlazorWebAssembly.Tools.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<IsPackable>false</IsPackable>
<IsShipping>false</IsShipping>

4
src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj
Просмотреть файл

@ -47,7 +47,7 @@
</PropertyGroup>
<ItemGroup>
<Content Include="$(BlazorWebAssemblyJSFile)" Pack="true" PackagePath="build\net5.0\" LinkBase="build\net5.0\" />
<Content Include="build\net5.0\*.props" Pack="true" PackagePath="build\net5.0\" />
<Content Include="$(BlazorWebAssemblyJSFile)" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" LinkBase="build\$(DefaultNetCoreTargetFramework)\" />
<Content Include="build\$(DefaultNetCoreTargetFramework)\*.props" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" />
</ItemGroup>
</Project>

0
src/Components/WebAssembly/WebAssembly/src/build/net5.0/Microsoft.AspNetCore.Components.WebAssembly.props → src/Components/WebAssembly/WebAssembly/src/build/net6.0/Microsoft.AspNetCore.Components.WebAssembly.props
Просмотреть файл

2
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/net5.0/linux-x64/publish ./
COPY ./Driver/bin/Release/net6.0/linux-x64/publish ./
COPY ./exec.sh ./
ENTRYPOINT [ "bash", "./exec.sh" ]

4
src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
Просмотреть файл

@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Tests
var applicationName = "CreateDefaultBuilderApp";
var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
{
TargetFramework = "net5.0",
TargetFramework = "net6.0",
HostingModel = HostingModel.InProcess
};
@ -213,7 +213,7 @@ namespace Microsoft.AspNetCore.Tests
{
var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
{
TargetFramework = "net5.0",
TargetFramework = "net6.0",
};
if (setTestEnvVars)

2
src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".net5.0">
<group targetFramework=".net6.0">
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsPackageVersion$" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">

2
src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".net5.0">
<group targetFramework=".net6.0">
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsPackageVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>

6
src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
Просмотреть файл

@ -42,11 +42,11 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>$(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.map</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
<!-- Optimize the framework using the crossgen tool -->
<CrossgenOutput Condition="'$(Configuration)' != 'Debug'">true</CrossgenOutput>
<CrossgenOutput Condition=" '$(CrossgenOutput)' == '' AND '$(Configuration)' != 'Debug' ">true</CrossgenOutput>
<!-- Produce crossgen profiling symbols (.ni.pdb or .map files). -->
<GenerateCrossgenProfilingSymbols>true</GenerateCrossgenProfilingSymbols>
<GenerateCrossgenProfilingSymbols Condition=" '$(CrossgenOutput)' == 'false' OR '$(TargetOsName)' == 'osx'">false</GenerateCrossgenProfilingSymbols>
<GenerateCrossgenProfilingSymbols Condition=" '$(CrossgenOutput)' != 'true' OR '$(TargetOsName)' == 'osx' ">false</GenerateCrossgenProfilingSymbols>
<!-- Always generated, even though output type == Library -->
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@ -531,7 +531,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
DependsOnTargets="_ResolveSharedFrameworkContent"
BeforeTargets="_GetPackageFiles"
Condition="'$(ManifestsPackagePath)' != ''">
<ItemGroup>
<SharedFxContent Condition="'%(SharedFxContent.Extension)' == '.dll'">
<PackagePath Condition="'%(SharedFxContent.IsNativeImage)' == 'true'">$(NativeAssetsPackagePath)</PackagePath>

2
src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs
Просмотреть файл

@ -14,6 +14,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
public const string NetCoreApp30 = "netcoreapp3.0";
public const string NetCoreApp31 = "netcoreapp3.1";
public const string Net50 = "net5.0";
public const string Net60 = "net6.0";
public const string Default = Net60;
public static bool Matches(string tfm1, string tfm2)
{

2
src/Hosting/test/FunctionalTests/LinkedApplicationTests.cs
Просмотреть файл

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
RuntimeFlavor.CoreClr,
RuntimeArchitecture.x64)
{
TargetFramework = Tfm.Net50,
TargetFramework = Tfm.Default,
RuntimeArchitecture = RuntimeArchitecture.x64,
ApplicationType = ApplicationType.Standalone,
PublishApplicationBeforeDeployment = true,

2
src/Hosting/test/FunctionalTests/ShutdownTests.cs
Просмотреть файл

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
RuntimeArchitecture.x64)
{
EnvironmentName = "Shutdown",
TargetFramework = Tfm.Net50,
TargetFramework = Tfm.Default,
ApplicationType = ApplicationType.Portable,
PublishApplicationBeforeDeployment = true,
StatusMessagesEnabled = false

2
src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
Просмотреть файл

@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
public WebHostBuilderTests(ITestOutputHelper output) : base(output) { }
public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.Kestrel)
.WithTfms(Tfm.Net50);
.WithTfms(Tfm.Default);
[ConditionalTheory]
[QuarantinedTest]

2
src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs
Просмотреть файл

@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn
{
Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp),
ApplicationType = ApplicationType.Portable,
TargetFramework = "Net5.0",
TargetFramework = "Net6.0",
EnvironmentName = environment,
SiteName = "HttpTestSite", // This is configured in the Http.config
ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null,

2
src/MusicStore/test/MusicStore.E2ETests/DotnetRunTests.cs
Просмотреть файл

@ -17,7 +17,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.Kestrel)
.WithTfms(Tfm.Net50);
.WithTfms(Tfm.Default);
[ConditionalTheory]
[MemberData(nameof(TestVariants))]

2
src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
Просмотреть файл

@ -18,7 +18,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllApplicationTypes()
.WithAllArchitectures();

2
src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
Просмотреть файл

@ -15,7 +15,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel)
.WithTfms(Tfm.Net50);
.WithTfms(Tfm.Default);
[ConditionalTheory]
[MemberData(nameof(TestVariants))]

2
src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
Просмотреть файл

@ -16,7 +16,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllApplicationTypes()
.WithAllHostingModels()
.WithAllArchitectures();

2
src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
Просмотреть файл

@ -17,7 +17,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllApplicationTypes()
.WithAllHostingModels();

2
src/MusicStore/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
Просмотреть файл

@ -244,7 +244,7 @@ namespace E2ETests
_remoteDeploymentConfig.AccountName,
_remoteDeploymentConfig.AccountPassword)
{
TargetFramework = Tfm.Net50,
TargetFramework = Tfm.Default,
ApplicationBaseUriHint = applicationBaseUrl,
ApplicationType = applicationType
};

2
src/MusicStore/test/MusicStore.E2ETests/StoreSmokeTests.cs
Просмотреть файл

@ -34,7 +34,7 @@ namespace E2ETests
EnvironmentName = "SocialTesting",
PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
TargetFramework = Tfm.Net50,
TargetFramework = Tfm.Default,
UserAdditionalCleanup = parameters =>
{
DbUtils.DropDatabase(musicStoreDbName, logger);

2
src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
Просмотреть файл

@ -130,7 +130,7 @@
<GenerateFileFromTemplate
TemplateFile="$(MSBuildThisFileDirectory)Infrastructure\Directory.Build.props.in"
Properties="RepoRoot=$(RepoRoot)"
Properties="RepoRoot=$(RepoRoot);DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework)"
OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" />
<!-- Workaround https://github.com/dotnet/core-setup/issues/6420 - there is no MSBuild setting for rollforward yet -->

4
src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/Directory.Build.props.in
Просмотреть файл

@ -1,8 +1,8 @@
<Project>
<!-- This file gets copied above the template test projects so that we disconnect the templates from the rest of the repository -->
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
</PropertyGroup>
<Import Project="${RepoRoot}src\Components\WebAssembly\Sdk\src\build\net5.0\Microsoft.NET.Sdk.BlazorWebAssembly.props" Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'" />
<Import Project="${RepoRoot}src\Components\WebAssembly\Sdk\src\build\${DefaultNetCoreTargetFramework}\Microsoft.NET.Sdk.BlazorWebAssembly.props" Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'" />
</Project>

1
src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/GenerateTestProps.targets
Просмотреть файл

@ -15,6 +15,7 @@
MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion);
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim());
DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework);
KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm);
RepoRoot=$(RepoRoot);
Configuration=$(Configuration);
ArtifactsBinDir=$(ArtifactsBinDir);

16
src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/TemplateTests.props.in
Просмотреть файл

@ -5,6 +5,8 @@
<!-- This sets an option which prevents the tests from rolling forward into a newer shared framework. -->
<UserRuntimeConfig>$(MSBuildThisFileDirectory)runtimeconfig.norollforward.json</UserRuntimeConfig>
<!-- Workaround while there is no 6.0 SDK available, suppress unsupported version error -->
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
</PropertyGroup>
<ItemGroup>
@ -22,6 +24,20 @@
RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" />
</ItemGroup>
<ItemGroup>
<!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 5.0 -->
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="${KnownAppHostPackOrFrameworkReferenceTfm}"
Condition="@(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="${KnownAppHostPackOrFrameworkReferenceTfm}"
Condition="@(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))"
/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="${MicrosoftNetCompilersToolsetPackageVersion}"

8
src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
Просмотреть файл

@ -387,12 +387,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json
Просмотреть файл

@ -222,12 +222,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"HostIdentifier": {
"type": "bind",

8
src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
Просмотреть файл

@ -86,12 +86,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
Просмотреть файл

@ -82,12 +82,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

6
src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
Просмотреть файл

@ -41,11 +41,11 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"ExcludeLaunchSettings": {
"type": "parameter",

6
src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
Просмотреть файл

@ -48,11 +48,11 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"HostIdentifier": {
"type": "bind",

8
src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
Просмотреть файл

@ -323,12 +323,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
Просмотреть файл

@ -313,12 +313,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
Просмотреть файл

@ -87,12 +87,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

10
src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
Просмотреть файл

@ -216,12 +216,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",
@ -298,4 +298,4 @@
"continueOnError": true
}
]
}
}

8
src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
Просмотреть файл

@ -82,12 +82,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
Просмотреть файл

@ -47,12 +47,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json
Просмотреть файл

@ -47,12 +47,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"copyrightYear": {
"type": "generated",

8
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
Просмотреть файл

@ -177,12 +177,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"HostIdentifier": {
"type": "bind",

8
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json
Просмотреть файл

@ -178,12 +178,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"HostIdentifier": {
"type": "bind",

8
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json
Просмотреть файл

@ -87,12 +87,12 @@
"datatype": "choice",
"choices": [
{
"choice": "net5.0",
"description": "Target net5.0"
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "net5.0",
"defaultValue": "net5.0"
"replaces": "net6.0",
"defaultValue": "net6.0"
},
"HostIdentifier": {
"type": "bind",

4
src/ProjectTemplates/scripts/Test-Template.ps1
Просмотреть файл

@ -32,7 +32,7 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) {
$proj = "$tmpDir/$templateName.$extension"
$projContent = Get-Content -Path $proj -Raw
$projContent = $projContent -replace ('<Project Sdk="Microsoft.NET.Sdk.Web">', "<Project Sdk=""Microsoft.NET.Sdk.Web"">
<Import Project=""$PSScriptRoot/../test/bin/Debug/net5.0/TestTemplates/TemplateTests.props"" />
<Import Project=""$PSScriptRoot/../test/bin/Debug/net6.0/TestTemplates/TemplateTests.props"" />
<ItemGroup>
<PackageReference Include=""Microsoft.NET.Sdk.Razor"" Version=""`$(MicrosoftNETSdkRazorPackageVersion)"" />
</ItemGroup>
@ -42,7 +42,7 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) {
$projContent | Set-Content $proj
dotnet.exe ef migrations add mvc
dotnet.exe publish --configuration Release
dotnet.exe bin\Release\net5.0\publish\$templateName.dll
dotnet.exe bin\Release\net6.0\publish\$templateName.dll
}
finally {
Pop-Location

2
src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<!-- This file gets copied above the template test projects so that we disconnect the templates from the rest of the repository -->
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
</PropertyGroup>
</Project>

1
src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
Просмотреть файл

@ -15,6 +15,7 @@
MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion);
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim());
DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework);
KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm);
RepoRoot=$(RepoRoot);
Configuration=$(Configuration);
ArtifactsBinDir=$(ArtifactsBinDir);

18
src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in
Просмотреть файл

@ -4,6 +4,8 @@
<RestoreAdditionalProjectSources>${RestoreAdditionalProjectSources}</RestoreAdditionalProjectSources>
<!-- This sets an option which prevents the tests from rolling forward into a newer shared framework. -->
<UserRuntimeConfig>$(MSBuildThisFileDirectory)runtimeconfig.norollforward.json</UserRuntimeConfig>
<!-- Workaround while there is no 6.0 SDK available, suppress unsupported version error -->
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
</PropertyGroup>
<ItemGroup>
@ -21,6 +23,20 @@
RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" />
</ItemGroup>
<ItemGroup>
<!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 5.0 -->
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="${KnownAppHostPackOrFrameworkReferenceTfm}"
Condition="@(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="${KnownAppHostPackOrFrameworkReferenceTfm}"
Condition="@(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${KnownAppHostPackOrFrameworkReferenceTfm}')))"
/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="${MicrosoftNetCompilersToolsetPackageVersion}"
@ -37,5 +53,5 @@
<RazorSdkDirectoryRoot>${ArtifactsBinDir}Microsoft.NET.Sdk.Razor\${Configuration}\sdk-output\</RazorSdkDirectoryRoot>
</PropertyGroup>
<Import Project="${RepoRoot}src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Microsoft.NET.Sdk.Razor.props" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' OR '$(RazorSdkCurrentVersionProps)' != ''" />
<Import Project="${RepoRoot}src\Components\WebAssembly\Sdk\src\build\net5.0\Microsoft.NET.Sdk.BlazorWebAssembly.props" Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'" />
<Import Project="${RepoRoot}src\Components\WebAssembly\Sdk\src\build\$(DefaultNetCoreTargetFramework)\Microsoft.NET.Sdk.BlazorWebAssembly.props" Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'" />
</Project>

2
src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
Просмотреть файл

@ -149,7 +149,7 @@
<GenerateFileFromTemplate
TemplateFile="$(MSBuildThisFileDirectory)Infrastructure\Directory.Build.props.in"
Properties="RepoRoot=$(RepoRoot)"
Properties="RepoRoot=$(RepoRoot);DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework)"
OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" />
<!-- Workaround https://github.com/dotnet/core-setup/issues/6420 - there is no MSBuild setting for rollforward yet -->

2
src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs
Просмотреть файл

@ -243,7 +243,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
var tfm =
#if NETCOREAPP
"net5.0";
"net6.0";
#else
#error Target framework needs to be updated.
#endif

2
src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/PackIntegrationTest.cs
Просмотреть файл

@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
{
public class PackIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
{
private static readonly string TFM = "net5.0";
private static readonly string TFM = "net6.0";
public PackIntegrationTest(BuildServerTestFixture buildServer)
: base(buildServer)

2
src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/PublishIntegrationTest.cs
Просмотреть файл

@ -434,7 +434,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
Assert.BuildFailed(result);
Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/net5.0/SimpleMvc.dll because it couldn't be found.
Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/net6.0/SimpleMvc.dll because it couldn't be found.
Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");

4
src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
Просмотреть файл

@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
<RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
<RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
<_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net5.0</_RazorSdkTasksTFM>
<_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net6.0</_RazorSdkTasksTFM>
<_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
<RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
<_RazorSdkToolAssembly>$(RazorSdkDirectoryRoot)tools\rzc.dll</_RazorSdkToolAssembly>
@ -72,7 +72,7 @@ Copyright (c) .NET Foundation. All rights reserved.
applications and RazorLangVersion 3 or above. -->
<StaticWebAssetsEnabled Condition="'$(StaticWebAssetsEnabled)' == ''">$(_Targeting30OrNewerRazorLangVersion)</StaticWebAssetsEnabled>
<!-- Controls whether or not the scoped css feature is enabled. By default is enabled for net5.0 applications and RazorLangVersion 5 or above -->
<!-- Controls whether or not the scoped css feature is enabled. By default is enabled for net6.0 applications and RazorLangVersion 5 or above -->
<ScopedCssEnabled Condition="'$(ScopedCssEnabled)' == '' and '$(StaticWebAssetsEnabled)' == 'true'">$(_Targeting30OrNewerRazorLangVersion)</ScopedCssEnabled>
</PropertyGroup>

2
src/Razor/test/testassets/Directory.Build.props
Просмотреть файл

@ -12,6 +12,8 @@
<!-- Do not resolve Reference ItemGroup since it has a different semantic meaning in Razor test apps -->
<EnableCustomReferenceResolution>false</EnableCustomReferenceResolution>
<DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
<RepoRoot Condition="'$(BuildingTestAppsIndependently)' == 'true' AND '$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'global.json'))\</RepoRoot>
<RazorSdkArtifactsDirectory>$(RepoRoot)artifacts\bin\Microsoft.NET.Sdk.Razor\</RazorSdkArtifactsDirectory>
<BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>

14
src/Razor/test/testassets/Directory.Build.targets
Просмотреть файл

@ -6,4 +6,18 @@
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>
<ItemGroup>
<!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 5.0 -->
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="$(DefaultNetCoreTargetFramework)"
Condition="@(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp5.0'))"
TargetFramework="$(DefaultNetCoreTargetFramework)"
Condition="@(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
/>
</ItemGroup>
</Project>

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/AspNetCorePortTests.cs
Просмотреть файл

@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable);
public static IEnumerable<object[]> InvalidTestVariants

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
Просмотреть файл

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable)
.WithAllHostingModels();

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
Просмотреть файл

@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable)
.WithAllHostingModels();

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs
Просмотреть файл

@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
RuntimeArchitecture = RuntimeArchitecture.x64,
RuntimeFlavor = RuntimeFlavor.CoreClr,
TargetFramework = Tfm.Net50,
TargetFramework = Tfm.Default,
HostingModel = HostingModel.InProcess,
PublishApplicationBeforeDeployment = true,
ApplicationPublisher = new PublishedApplicationPublisher(Helpers.GetInProcessTestSitesName()),

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/PublishedSitesFixture.cs
Просмотреть файл

@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
RuntimeFlavor = RuntimeFlavor.CoreClr,
RuntimeArchitecture = RuntimeArchitecture.x64,
HostingModel = hostingModel,
TargetFramework = Tfm.Net50
TargetFramework = Tfm.Default
});
}

4
src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs
Просмотреть файл

@ -21,13 +21,13 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable)
.WithAllHostingModels();
public static TestMatrix InprocessTestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable)
.WithHostingModels(HostingModel.InProcess);

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs
Просмотреть файл

@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllApplicationTypes()
.WithAncmV2InProcess();

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
Просмотреть файл

@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable)
.WithAllHostingModels();

2
src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
Просмотреть файл

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.Net50);
.WithTfms(Tfm.Default);
[ConditionalTheory]
[RequiresIIS(IISCapability.WindowsAuthentication)]

2
src/Servers/Kestrel/samples/http2cat/http2cat.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

2
src/Servers/test/FunctionalTests/HelloWorldTest.cs
Просмотреть файл

@ -21,7 +21,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithApplicationTypes(ApplicationType.Portable)
.WithAllHostingModels()
.WithAllArchitectures();

2
src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs
Просмотреть файл

@ -22,7 +22,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys, ServerType.Kestrel)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllHostingModels();
[ConditionalTheory]

8
src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
Просмотреть файл

@ -34,7 +34,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix NoCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllHostingModels();
[ConditionalTheory]
@ -46,7 +46,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix HostCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Nginx)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllHostingModels();
[ConditionalTheory]
@ -58,7 +58,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix AppCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) // No pass-through compression for nginx
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllHostingModels();
[ConditionalTheory]
@ -70,7 +70,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix HostAndAppCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
.WithTfms(Tfm.Net50)
.WithTfms(Tfm.Default)
.WithAllHostingModels();
[ConditionalTheory]

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше