huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update templating to use netcoreapp3.0

This commit is contained in:
Nate McMaster 2018-06-29 16:09:57 -07:00
parent ffedeb886c
commit 1f2e966454
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
35 changed files with 116 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Directory.Build.targets
View File

@ -1,10 +1,8 @@
<Project>
<PropertyGroup>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>
</Project>
</Project>

4
NuGetPackageVerifier.json
View File

@ -19,7 +19,7 @@
"Template"
]
},
"Microsoft.DotNet.Web.ProjectTemplates.2.2": {
"Microsoft.DotNet.Web.ProjectTemplates.3.0": {
"packageTypes": [
"Template"
]
@ -31,4 +31,4 @@
}
}
}
}
}

4
build/dependencies.props
View File

@ -33,9 +33,7 @@
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.0-preview1-34530</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34530</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsProcessSourcesPackageVersion>2.2.0-preview1-34530</MicrosoftExtensionsProcessSourcesPackageVersion>
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
<MicrosoftNETCoreApp21PackageVersion>2.1.0</MicrosoftNETCoreApp21PackageVersion>
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreApp22PackageVersion>
<MicrosoftNETCoreApp30PackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreApp30PackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34530</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.2.0-preview1-34530</MicrosoftVisualStudioWebBrowserLinkPackageVersion>

3
build/repo.props
View File

@ -8,8 +8,7 @@
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
<!-- SkipAspNetCoreRuntimeInstall must be set when building templates before the shared framework is available -->
<AspNetCoreRuntime Include="$(MicrosoftAspNetCoreAllPackageVersion)"

2
migrations/updateMigrations.cmd
View File

@ -1,4 +1,4 @@
SET version=2.2.0-preview1
SET version=3.0.0-alpha1
echo Make sure to have ran build.cmd once to ensure artifacts have been created.
echo Generating version=%version%, edit updateMigrations.cmd to update the version.

2
src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Web Client-Side File Templates for Microsoft Template Engine</Description>
</PropertyGroup>

2
src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Web File Templates for Microsoft Template Engine</Description>
</PropertyGroup>

6
src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
View File

@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<ItemGroup>

6
src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in
View File

@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<ItemGroup>

6
src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
View File

@ -3,8 +3,8 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<PackageId>Microsoft.DotNet.Web.ProjectTemplates.2.2</PackageId>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PackageId>Microsoft.DotNet.Web.ProjectTemplates.3.0</PackageId>
<Description>ASP.NET Core Web Template Pack for Microsoft Template Engine</Description>
</PropertyGroup>
@ -32,7 +32,7 @@
MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion);
MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion);
MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion);
MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);
MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion);
MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion);
MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion);

6
src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
<DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType>
@ -9,11 +9,11 @@
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<!--#if (IndividualLocalAuth && !UseLocalDB) -->

6
src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
@ -9,11 +9,11 @@
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<!--#if (IndividualLocalAuth && !UseLocalDB) -->

6
src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in
View File

@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<ItemGroup>

6
src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
View File

@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<ItemGroup>

6
src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in
View File

@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup>
<ItemGroup>

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
View File

@ -10,7 +10,7 @@
"description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
"groupIdentity": "Microsoft.Web.Empty",
"precedence": "3000",
"identity": "Microsoft.Web.Empty.CSharp.2.2",
"identity": "Microsoft.Web.Empty.CSharp.3.0",
"shortName": "web",
"tags": {
"language": "C#",
@ -99,12 +99,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -146,4 +146,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
View File

@ -9,7 +9,7 @@
"description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
"groupIdentity": "Microsoft.Web.Empty",
"precedence": "3000",
"identity": "Microsoft.Web.Empty.FSharp.2.2",
"identity": "Microsoft.Web.Empty.FSharp.3.0",
"shortName": "web",
"tags": {
"language": "F#",
@ -95,12 +95,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -142,4 +142,4 @@
"continueOnError": true
}
]
}
}

10
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
View File

@ -12,7 +12,7 @@
"description": "A project for creating a Razor class library that targets .NET Standard",
"groupIdentity": "Microsoft.Web.Razor",
"precedence": "3000",
"identity": "Microsoft.Web.Razor.Library.CSharp.2.2",
"identity": "Microsoft.Web.Razor.Library.CSharp.3.0",
"shortName": "razorclasslib",
"tags": {
"language": "C#",
@ -34,11 +34,11 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"defaultValue": "netcoreapp2.2"
"defaultValue": "netcoreapp3.0"
},
"HostIdentifier": {
"type": "bind",
@ -84,4 +84,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
View File

@ -11,7 +11,7 @@
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content",
"groupIdentity": "Microsoft.Web.RazorPages",
"precedence": "3000",
"identity": "Microsoft.Web.RazorPages.CSharp.2.2",
"identity": "Microsoft.Web.RazorPages.CSharp.3.0",
"shortName": [
"razor",
"webapp"
@ -329,12 +329,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -364,4 +364,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
View File

@ -10,7 +10,7 @@
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
"groupIdentity": "Microsoft.Web.Mvc",
"precedence": "3000",
"identity": "Microsoft.Web.Mvc.CSharp.2.2",
"identity": "Microsoft.Web.Mvc.CSharp.3.0",
"shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": {
@ -319,12 +319,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -360,4 +360,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
View File

@ -10,7 +10,7 @@
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
"groupIdentity": "Microsoft.Web.Mvc",
"precedence": "3000",
"identity": "Microsoft.Web.Mvc.FSharp.2.2",
"identity": "Microsoft.Web.Mvc.FSharp.3.0",
"shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": {
@ -106,12 +106,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -153,4 +153,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
View File

@ -10,7 +10,7 @@
"description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
"groupIdentity": "Microsoft.Web.WebApi",
"precedence": "3000",
"identity": "Microsoft.Web.WebApi.CSharp.2.2",
"identity": "Microsoft.Web.WebApi.CSharp.3.0",
"shortName": "webapi",
"tags": {
"language": "C#",
@ -222,12 +222,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -263,4 +263,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
View File

@ -9,7 +9,7 @@
"description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
"groupIdentity": "Microsoft.Web.WebApi",
"precedence": "3000",
"identity": "Microsoft.Web.WebApi.FSharp.2.2",
"identity": "Microsoft.Web.WebApi.FSharp.3.0",
"shortName": "webapi",
"tags": {
"language": "F#",
@ -95,12 +95,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"copyrightYear": {
"type": "generated",
@ -142,4 +142,4 @@
"continueOnError": true
}
]
}
}

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
View File

@ -3,7 +3,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Single Page Application templates for ASP.NET Core</Description>
<PackageTags>$(PackageTags);spa</PackageTags>
</PropertyGroup>

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>

12
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
View File

@ -6,7 +6,7 @@
"SPA"
],
"groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular",
"identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.2.2",
"identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.3.0",
"name": "ASP.NET Core with Angular",
"preferNameDirectory": true,
"primaryOutputs": [
@ -99,12 +99,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"HostIdentifier": {
"type": "bind",
@ -140,4 +140,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json
View File

@ -6,7 +6,7 @@
"SPA"
],
"groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React",
"identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.2.2",
"identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.3.0",
"name": "ASP.NET Core with React.js",
"preferNameDirectory": true,
"primaryOutputs": [
@ -99,12 +99,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"HostIdentifier": {
"type": "bind",
@ -140,4 +140,4 @@
"continueOnError": true
}
]
}
}

12
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json
View File

@ -6,7 +6,7 @@
"SPA"
],
"groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux",
"identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.2.2",
"identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.3.0",
"name": "ASP.NET Core with React.js and Redux",
"preferNameDirectory": true,
"primaryOutputs": [
@ -99,12 +99,12 @@
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.2",
"description": "Target netcoreapp2.2"
"choice": "netcoreapp3.0",
"description": "Target netcoreapp3.0"
}
],
"replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.2"
"replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp3.0"
},
"HostIdentifier": {
"type": "bind",
@ -140,4 +140,4 @@
"continueOnError": true
}
]
}
}

4
test/DotNetToolsInstaller/DotNetToolsInstaller.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RestoreProjectStyle>DotnetToolReference</RestoreProjectStyle>
</PropertyGroup>
@ -9,4 +9,4 @@
<PackageReference Include="dotnet-ef" Version="$(DotNetEfPackageVersion)" />
</ItemGroup>
</Project>
</Project>

4
test/GenerateTestProps.targets
View File

@ -18,12 +18,12 @@
<!-- Overriding this property to fix tests until 2.1.0 is released or we have updated the tfm to netcoreapp2.2 https://github.com/aspnet/templating/issues/488 -->
<!-- <TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1])</TargetsProperties> -->
<TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=2.2</TargetsProperties>
<TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=3.0</TargetsProperties>
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion)</TargetsProperties>
<!-- Overriding this property to fix tests until 2.1.0 is released or we have updated the tfm to netcoreapp2.2 https://github.com/aspnet/templating/issues/488 -->
<!-- <TargetsProperties>$(TargetsProperties);BundledAspNetCoreAppTargetFrameworkVersion=$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[1])</TargetsProperties> -->
<TargetsProperties>BundledAspNetCoreAppTargetFrameworkVersion=2.2</TargetsProperties>
<TargetsProperties>BundledAspNetCoreAppTargetFrameworkVersion=3.0</TargetsProperties>
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)</TargetsProperties>
</PropertyGroup>

4
test/TemplateTests.targets.in
View File

@ -57,6 +57,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Default patch version of .App Framework -->
<PropertyGroup Condition="'$(DefaultAspNetCoreAppPatchVersion)' == ''">
<DefaultAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(DefaultPatchVersionForAspNetCoreApp2_1)</DefaultAspNetCoreAppPatchVersion>
<DefaultAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.2'">$(DefaultPatchVersionForAspNetCoreApp2_2)</DefaultAspNetCoreAppPatchVersion>
<DefaultAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '3.0'">$(DefaultPatchVersionForAspNetCoreApp3_0)</DefaultAspNetCoreAppPatchVersion>
<!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props -->
@ -81,6 +83,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">
<!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
<!-- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreApp2_1)</LatestAspNetCoreAppPatchVersion> -->
<!-- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.2'">$(LatestPatchVersionForAspNetCoreApp2_2)</LatestAspNetCoreAppPatchVersion> -->
<!-- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '3.0'">$(LatestPatchVersionForAspNetCoreApp3_0)</LatestAspNetCoreAppPatchVersion> -->
<!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props -->

2
test/Templates.Test/Helpers/AspNetProcess.cs
View File

@ -18,7 +18,7 @@ namespace Templates.Test.Helpers
{
public class AspNetProcess : IDisposable
{
private const string DefaultFramework = "netcoreapp2.2";
private const string DefaultFramework = "netcoreapp3.0";
private const string ListeningMessagePrefix = "Now listening on: ";
private static int Port = 5000 + new Random().Next(3000);

7
test/Templates.Test/Templates.Test.csproj
View File

@ -1,7 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
<!-- Workaround until https://github.com/aspnet/Common/pull/385 is done -->
<DefineConstants>$(DefineConstants);NETCOREAPP2_2</DefineConstants>
</PropertyGroup>
<ItemGroup>
@ -33,7 +36,7 @@
<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>DotNetEfFullPath</_Parameter1>
<_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.2/any/dotnet-ef.dll</_Parameter2>
<_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.0/any/dotnet-ef.dll</_Parameter2>
</AssemblyAttribute>
</ItemGroup>