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

Move templates to netcoreapp2.2

This commit is contained in:
Ryan Brandenburg 2018-05-17 11:51:03 -07:00
parent 90fe58be75
commit 15ca3dcdaa
35 changed files with 193 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NuGetPackageVerifier.json
View File

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

60
build/dependencies.props
View File

@ -4,42 +4,42 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package Versions"> <PropertyGroup Label="Package Versions">
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<DotNetEfPackageVersion>2.2.0-preview1-34184</DotNetEfPackageVersion> <DotNetEfPackageVersion>2.2.0-preview1-34228</DotNetEfPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17051</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17057</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAllPackageVersion> <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAppPackageVersion> <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion> <MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
<MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion> <MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion> <MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion> <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion> <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
<MicrosoftAspNetCoreCookiePolicyPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreCookiePolicyPackageVersion> <MicrosoftAspNetCoreCookiePolicyPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreCookiePolicyPackageVersion>
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion> <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpsPolicyPackageVersion> <MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion> <MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreIdentityUIPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreIdentityUIPackageVersion> <MicrosoftAspNetCoreIdentityUIPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreIdentityUIPackageVersion>
<MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreMvcPackageVersion> <MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreMvcPackageVersion>
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion> <MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
<MicrosoftAspNetCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCorePackageVersion> <MicrosoftAspNetCorePackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCorePackageVersion>
<MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion> <MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>
<MicrosoftAspNetCoreSpaServicesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreSpaServicesPackageVersion> <MicrosoftAspNetCoreSpaServicesPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreSpaServicesPackageVersion>
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreStaticFilesPackageVersion> <MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreStaticFilesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34228</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion> <MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.0-preview1-34184</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.0-preview1-34228</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview1-34184</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview1-34228</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.0-preview1-34184</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.0-preview1-34228</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34228</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsProcessSourcesPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsProcessSourcesPackageVersion> <MicrosoftExtensionsProcessSourcesPackageVersion>2.2.0-preview1-34228</MicrosoftExtensionsProcessSourcesPackageVersion>
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion> <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
<MicrosoftNETCoreApp21PackageVersion>2.1.0-rc1</MicrosoftNETCoreApp21PackageVersion> <MicrosoftNETCoreApp21PackageVersion>2.1.0-rc1</MicrosoftNETCoreApp21PackageVersion>
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26509-06</MicrosoftNETCoreApp22PackageVersion> <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26509-06</MicrosoftNETCoreApp22PackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34184</MicrosoftNETSdkRazorPackageVersion> <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34228</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.2.0-preview1-34184</MicrosoftVisualStudioWebBrowserLinkPackageVersion> <MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.2.0-preview1-34228</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.2.0-preview1-34184</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion> <MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.2.0-preview1-34228</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<SeleniumFirefoxWebDriverPackageVersion>0.19.0</SeleniumFirefoxWebDriverPackageVersion> <SeleniumFirefoxWebDriverPackageVersion>0.19.0</SeleniumFirefoxWebDriverPackageVersion>
<SeleniumSupportPackageVersion>3.7.0</SeleniumSupportPackageVersion> <SeleniumSupportPackageVersion>3.7.0</SeleniumSupportPackageVersion>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-17051 version:2.2.0-preview1-17057
commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b commithash:dc12ed3ec0248281f96bdb99834310ec67507ee3

2
src/Directory.Build.targets
View File

@ -2,6 +2,8 @@
<PropertyGroup> <PropertyGroup>
<IncludeSource>false</IncludeSource> <IncludeSource>false</IncludeSource>
<IncludeSymbols>false</IncludeSymbols> <IncludeSymbols>false</IncludeSymbols>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="..\Directory.Build.targets" /> <Import Project="..\Directory.Build.targets" />

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

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

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

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

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

@ -1,16 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</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>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="wwwroot\" /> <Folder Include="wwwroot\" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" /> <PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />

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

@ -1,10 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</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>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Startup.fs" /> <Compile Include="Startup.fs" />
<Compile Include="Program.fs" /> <Compile Include="Program.fs" />

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

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

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

@ -1,13 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId> <UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
<DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType> <DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey> <WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</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>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
</ItemGroup>
<!--#if (IndividualLocalAuth && !UseLocalDB) --> <!--#if (IndividualLocalAuth && !UseLocalDB) -->
<!--#endif --> <!--#endif -->

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

@ -1,13 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType> <DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId> <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'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</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>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
</ItemGroup>
<!--#if (IndividualLocalAuth && !UseLocalDB) --> <!--#if (IndividualLocalAuth && !UseLocalDB) -->
<!--#endif --> <!--#endif -->

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

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

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

@ -1,19 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId> <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'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</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>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="wwwroot\" /> <Folder Include="wwwroot\" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
</ItemGroup> </ItemGroup>

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

@ -1,10 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</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>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Controllers/ValuesController.fs" /> <Compile Include="Controllers/ValuesController.fs" />
<Compile Include="Startup.fs" /> <Compile Include="Startup.fs" />

10
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.", "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", "groupIdentity": "Microsoft.Web.Empty",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Empty.CSharp.2.1", "identity": "Microsoft.Web.Empty.CSharp.2.2",
"shortName": "web", "shortName": "web",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -99,12 +99,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

10
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.", "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", "groupIdentity": "Microsoft.Web.Empty",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Empty.FSharp.2.1", "identity": "Microsoft.Web.Empty.FSharp.2.2",
"shortName": "web", "shortName": "web",
"tags": { "tags": {
"language": "F#", "language": "F#",
@ -95,12 +95,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

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

@ -1,13 +1,18 @@
{ {
"$schema": "http://json.schemastore.org/template", "$schema": "http://json.schemastore.org/template",
"author": "Microsoft", "author": "Microsoft",
"classifications": ["Web", "Razor", "Library", "Razor Class Library"], "classifications": [
"Web",
"Razor",
"Library",
"Razor Class Library"
],
"name": "Razor Class Library", "name": "Razor Class Library",
"generatorVersions": "[1.0.0.0-*)", "generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a Razor class library that targets .NET Standard", "description": "A project for creating a Razor class library that targets .NET Standard",
"groupIdentity": "Microsoft.Web.Razor", "groupIdentity": "Microsoft.Web.Razor",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Razor.Library.CSharp.2.1", "identity": "Microsoft.Web.Razor.Library.CSharp.2.2",
"shortName": "razorclasslib", "shortName": "razorclasslib",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -29,11 +34,11 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"HostIdentifier": { "HostIdentifier": {
"type": "bind", "type": "bind",
@ -47,7 +52,9 @@
} }
}, },
"primaryOutputs": [ "primaryOutputs": [
{ "path": "Company.RazorClassLibrary1.csproj" }, {
"path": "Company.RazorClassLibrary1.csproj"
},
{ {
"condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
"path": "Areas/MyFeature/Pages/Page1.cshtml" "path": "Areas/MyFeature/Pages/Page1.cshtml"
@ -59,7 +66,9 @@
"condition": "(!skipRestore)", "condition": "(!skipRestore)",
"description": "Restore NuGet packages required by this project.", "description": "Restore NuGet packages required by this project.",
"manualInstructions": [ "manualInstructions": [
{ "text": "Run 'dotnet restore'" } {
"text": "Run 'dotnet restore'"
}
], ],
"actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
"continueOnError": true "continueOnError": true

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

@ -11,8 +11,11 @@
"description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content",
"groupIdentity": "Microsoft.Web.RazorPages", "groupIdentity": "Microsoft.Web.RazorPages",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.RazorPages.CSharp.2.1", "identity": "Microsoft.Web.RazorPages.CSharp.2.2",
"shortName": [ "razor", "webapp" ], "shortName": [
"razor",
"webapp"
],
"thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -326,12 +329,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",
@ -361,4 +364,4 @@
"continueOnError": true "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.", "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", "groupIdentity": "Microsoft.Web.Mvc",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Mvc.CSharp.2.1", "identity": "Microsoft.Web.Mvc.CSharp.2.2",
"shortName": "mvc", "shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": { "tags": {
@ -319,12 +319,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",
@ -360,4 +360,4 @@
"continueOnError": true "continueOnError": true
} }
] ]
} }

10
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.", "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", "groupIdentity": "Microsoft.Web.Mvc",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Mvc.FSharp.2.1", "identity": "Microsoft.Web.Mvc.FSharp.2.2",
"shortName": "mvc", "shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": { "tags": {
@ -106,12 +106,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

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.", "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", "groupIdentity": "Microsoft.Web.WebApi",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.WebApi.CSharp.2.1", "identity": "Microsoft.Web.WebApi.CSharp.2.2",
"shortName": "webapi", "shortName": "webapi",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -222,12 +222,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",
@ -263,4 +263,4 @@
"continueOnError": true "continueOnError": true
} }
] ]
} }

10
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.", "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", "groupIdentity": "Microsoft.Web.WebApi",
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.WebApi.FSharp.2.1", "identity": "Microsoft.Web.WebApi.FSharp.2.2",
"shortName": "webapi", "shortName": "webapi",
"tags": { "tags": {
"language": "F#", "language": "F#",
@ -95,12 +95,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.1", "choice": "netcoreapp2.2",
"description": "Target netcoreapp2.1" "description": "Target netcoreapp2.2"
} }
], ],
"replaces": "netcoreapp2.1", "replaces": "netcoreapp2.2",
"defaultValue": "netcoreapp2.1" "defaultValue": "netcoreapp2.2"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
@ -11,6 +11,8 @@
<!-- Set this to true if you enable server-side prerendering --> <!-- Set this to true if you enable server-side prerendering -->
<BuildServerSideRenderer>false</BuildServerSideRenderer> <BuildServerSideRenderer>false</BuildServerSideRenderer>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">

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" /> <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<Description>Single Page Application templates for ASP.NET Core</Description> <Description>Single Page Application templates for ASP.NET Core</Description>
<PackageTags>$(PackageTags);spa</PackageTags> <PackageTags>$(PackageTags);spa</PackageTags>
</PropertyGroup> </PropertyGroup>

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

@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<SpaRoot>ClientApp\</SpaRoot> <SpaRoot>ClientApp\</SpaRoot>
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">

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

@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<SpaRoot>ClientApp\</SpaRoot> <SpaRoot>ClientApp\</SpaRoot>
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">

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

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

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Directory.Build.targets
View File

@ -4,4 +4,6 @@
This file intentionally left mostly blank to ensure the template projects This file intentionally left mostly blank to ensure the template projects
are independent from the template package build config. are independent from the template package build config.
--> -->
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</Project> </Project>

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

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

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

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

4
test/GenerateTestProps.targets
View File

@ -9,12 +9,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 --> <!-- 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=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1])</TargetsProperties> -->
<TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=2.1</TargetsProperties> <TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=2.2</TargetsProperties>
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion)</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 --> <!-- 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>$(TargetsProperties);BundledAspNetCoreAppTargetFrameworkVersion=$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[1])</TargetsProperties> -->
<TargetsProperties>BundledAspNetCoreAppTargetFrameworkVersion=2.1</TargetsProperties> <TargetsProperties>BundledAspNetCoreAppTargetFrameworkVersion=2.2</TargetsProperties>
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)</TargetsProperties> <TargetsProperties>$(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)</TargetsProperties>
</PropertyGroup> </PropertyGroup>

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

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

1
test/Templates.Test/Helpers/TemplatePackageInstaller.cs
View File

@ -18,6 +18,7 @@ namespace Templates.Test.Helpers
"Microsoft.DotNet.Web.ProjectTemplates.1.x", "Microsoft.DotNet.Web.ProjectTemplates.1.x",
"Microsoft.DotNet.Web.ProjectTemplates.2.0", "Microsoft.DotNet.Web.ProjectTemplates.2.0",
"Microsoft.DotNet.Web.ProjectTemplates.2.1", "Microsoft.DotNet.Web.ProjectTemplates.2.1",
"Microsoft.DotNet.Web.ProjectTemplates.2.2",
"Microsoft.DotNet.Web.Spa.ProjectTemplates", "Microsoft.DotNet.Web.Spa.ProjectTemplates",
}; };

4
test/Templates.Test/Helpers/TemplateTestBase.cs
View File

@ -75,7 +75,7 @@ $@"<Project>
if (!string.IsNullOrEmpty(auth)) if (!string.IsNullOrEmpty(auth))
{ {
args += $" -au {auth}"; args += $" --auth {auth}";
} }
if (!string.IsNullOrEmpty(language)) if (!string.IsNullOrEmpty(language))
@ -85,7 +85,7 @@ $@"<Project>
if (useLocalDB) if (useLocalDB)
{ {
args += $" -uld"; args += $" --use-local-db";
} }
if (noHttps) if (noHttps)

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

@ -33,7 +33,7 @@
<ItemGroup> <ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute"> <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>DotNetEfFullPath</_Parameter1> <_Parameter1>DotNetEfFullPath</_Parameter1>
<_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.1/any/dotnet-ef.dll</_Parameter2> <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.2/any/dotnet-ef.dll</_Parameter2>
</AssemblyAttribute> </AssemblyAttribute>
</ItemGroup> </ItemGroup>