diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2020-10-27 10:04:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-27 10:04:33 +0300 |
commit | 219ecd6880120215137f4d6ef0dd2aa62c780af2 (patch) | |
tree | c916f0be724be16e6f003f4dd748332410dbbf1d /src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp | |
parent | 062237e054487e2e53c186660e459eda69b75e59 (diff) |
[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
Diffstat (limited to 'src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp')
-rw-r--r-- | src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index d9d9cf8193..f3101a9caf 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -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", |