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

Merge branch 'master' into merge/release/2.2-to-master

This commit is contained in:
Ryan Brandenburg 2018-07-16 11:44:08 -07:00 committed by GitHub
parent 26fd3dce25 1c9817a197
commit 4aa0c0cf61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 156 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -4,7 +4,7 @@ install:
- ps: Install-Product node 8 x64 - ps: Install-Product node 8 x64
branches: branches:
only: only:
- dev - master
- /^release\/.*$/ - /^release\/.*$/
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
build_script: build_script:

2
.travis.yml
View File

@ -17,7 +17,7 @@ os:
osx_image: xcode9.2 osx_image: xcode9.2
branches: branches:
only: only:
- dev - master
- /^release\/.*$/ - /^release\/.*$/
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
before_install: before_install:

2
.vsts-pipelines/builds/ci-internal.yml
View File

@ -7,7 +7,7 @@ resources:
- repository: buildtools - repository: buildtools
type: git type: git
name: aspnet-BuildTools name: aspnet-BuildTools
ref: refs/heads/release/2.2 ref: refs/heads/master
phases: phases:
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools

2
.vsts-pipelines/builds/ci-public.yml
View File

@ -9,7 +9,7 @@ resources:
type: github type: github
endpoint: DotNet-Bot GitHub Connection endpoint: DotNet-Bot GitHub Connection
name: aspnet/BuildTools name: aspnet/BuildTools
ref: refs/heads/release/2.2 ref: refs/heads/master
phases: phases:
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools

3
Directory.Build.targets
View File

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

2
NuGetPackageVerifier.json
View File

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

64
build/dependencies.props
View File

@ -4,47 +4,45 @@
</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-34694</DotNetEfPackageVersion> <DotNetEfPackageVersion>3.0.0-alpha1-10081</DotNetEfPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17099</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-10009</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreAppPackageVersion> <MicrosoftAspNetCoreAppPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion> <MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
<MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion> <MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion> <MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion> <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion> <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
<MicrosoftAspNetCoreCookiePolicyPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreCookiePolicyPackageVersion> <MicrosoftAspNetCoreCookiePolicyPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreCookiePolicyPackageVersion>
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion> <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreHttpsPolicyPackageVersion> <MicrosoftAspNetCoreHttpsPolicyPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion> <MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreIdentityUIPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreIdentityUIPackageVersion> <MicrosoftAspNetCoreIdentityUIPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreIdentityUIPackageVersion>
<MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreMvcPackageVersion> <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreMvcPackageVersion>
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion> <MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
<MicrosoftAspNetCorePackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCorePackageVersion> <MicrosoftAspNetCorePackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCorePackageVersion>
<MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion> <MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>
<MicrosoftAspNetCoreSpaServicesPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreSpaServicesPackageVersion> <MicrosoftAspNetCoreSpaServicesPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreSpaServicesPackageVersion>
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreStaticFilesPackageVersion> <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10081</MicrosoftAspNetCoreStaticFilesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10081</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-34694</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-alpha1-10081</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview1-34694</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-alpha1-10081</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.0-preview1-34694</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-alpha1-10081</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34694</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-alpha1-10081</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsProcessSourcesPackageVersion>2.2.0-preview1-34694</MicrosoftExtensionsProcessSourcesPackageVersion> <MicrosoftExtensionsProcessSourcesPackageVersion>3.0.0-alpha1-10081</MicrosoftExtensionsProcessSourcesPackageVersion>
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion> <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26710-03</MicrosoftNETCoreApp30PackageVersion>
<MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion> <MicrosoftNETSdkRazorPackageVersion>3.0.0-alpha1-10081</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreApp22PackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34694</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.2.0-preview1-34694</MicrosoftVisualStudioWebBrowserLinkPackageVersion> <MicrosoftVisualStudioWebBrowserLinkPackageVersion>3.0.0-alpha1-10081</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.2.0-preview1-34694</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion> <MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>3.0.0-alpha1-10081</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion> <SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion>
<SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion>
<SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion> <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion>
<SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion> <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.5.0</SystemSecurityPermissionsPackageVersion> <SystemSecurityPermissionsPackageVersion>4.6.0-preview1-26708-04</SystemSecurityPermissionsPackageVersion>
<XunitAnalyzersPackageVersion>0.9.0</XunitAnalyzersPackageVersion> <XunitAnalyzersPackageVersion>0.9.0</XunitAnalyzersPackageVersion>
<XunitPackageVersion>2.3.1</XunitPackageVersion> <XunitPackageVersion>2.3.1</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0-rc.1.build4038</XunitRunnerVisualStudioPackageVersion> <XunitRunnerVisualStudioPackageVersion>2.4.0-rc.1.build4038</XunitRunnerVisualStudioPackageVersion>

4
build/repo.props
View File

@ -4,13 +4,11 @@
<PropertyGroup> <PropertyGroup>
<!-- These properties are use by the automation that updates dependencies.props --> <!-- These properties are use by the automation that updates dependencies.props -->
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId> <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
<LineupPackageVersion>2.2.0-*</LineupPackageVersion>
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource> <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" /> <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
<!-- SkipAspNetCoreRuntimeInstall must be set when building templates before the shared framework is available --> <!-- SkipAspNetCoreRuntimeInstall must be set when building templates before the shared framework is available -->
<AspNetCoreRuntime Include="$(MicrosoftAspNetCoreAppPackageVersion)" <AspNetCoreRuntime Include="$(MicrosoftAspNetCoreAppPackageVersion)"

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-17099 version:3.0.0-alpha1-10009
commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 commithash:86be4707e47d2f1930a982f2b59eacfc4196da33

4
korebuild.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "release/2.2", "channel": "master",
"toolsets": { "toolsets": {
"nodejs": { "nodejs": {
"required": true, "required": true,

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 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. echo Generating version=%version%, edit updateMigrations.cmd to update the version.

6
run.ps1
View File

@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
Example config file: Example config file:
```json ```json
{ {
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "dev", "channel": "master",
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
} }
``` ```
@ -192,7 +192,7 @@ if (!$DotNetHome) {
else { Join-Path $PSScriptRoot '.dotnet'} else { Join-Path $PSScriptRoot '.dotnet'}
} }
if (!$Channel) { $Channel = 'dev' } if (!$Channel) { $Channel = 'master' }
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
# Execute # Execute

2
run.sh
View File

@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
[ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
fi fi
[ -z "$channel" ] && channel='dev' [ -z "$channel" ] && channel='master'
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
get_korebuild get_korebuild

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.2</TargetFramework> <TargetFramework>netcoreapp3.0</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.2</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<Description>Web File Templates for Microsoft Template Engine</Description> <Description>Web File Templates for Microsoft Template Engine</Description>
</PropertyGroup> </PropertyGroup>

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

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

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

@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use --> <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion> <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" /> <DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup> </ItemGroup>
<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" /> <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<PackageId>Microsoft.DotNet.Web.ProjectTemplates.2.2</PackageId> <PackageId>Microsoft.DotNet.Web.ProjectTemplates.3.0</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,7 +32,7 @@
MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion); MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion);
MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion);
MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion); MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);
MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion); MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion);
MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion); MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion);
MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion); MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion);

6
src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-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.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</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>
@ -9,11 +9,11 @@
<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 --> <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion> <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" /> <DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup> </ItemGroup>
<!--#if (IndividualLocalAuth && !UseLocalDB) --> <!--#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"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</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>
@ -9,11 +9,11 @@
<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 --> <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion> <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" /> <DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup> </ItemGroup>
<!--#if (IndividualLocalAuth && !UseLocalDB) --> <!--#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"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</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 --> <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion> <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<RuntimeFrameworkVersion>${MicrosoftNETCoreApp22PackageVersion}</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>${MicrosoftNETCoreApp30PackageVersion}</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DotNetCoreRuntime Include="${MicrosoftNETCoreApp22PackageVersion}" /> <DotNetCoreRuntime Include="${MicrosoftNETCoreApp30PackageVersion}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

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

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

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

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.2", "identity": "Microsoft.Web.Empty.CSharp.3.0",
"shortName": "web", "shortName": "web",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -99,12 +99,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"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.2", "identity": "Microsoft.Web.Empty.FSharp.3.0",
"shortName": "web", "shortName": "web",
"tags": { "tags": {
"language": "F#", "language": "F#",
@ -95,12 +95,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

8
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", "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.2", "identity": "Microsoft.Web.Razor.Library.CSharp.3.0",
"shortName": "razorclasslib", "shortName": "razorclasslib",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -34,11 +34,11 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"HostIdentifier": { "HostIdentifier": {
"type": "bind", "type": "bind",

10
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", "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.2", "identity": "Microsoft.Web.RazorPages.CSharp.3.0",
"shortName": [ "shortName": [
"razor", "razor",
"webapp" "webapp"
@ -329,12 +329,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

10
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.2", "identity": "Microsoft.Web.Mvc.CSharp.3.0",
"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.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

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.2", "identity": "Microsoft.Web.Mvc.FSharp.3.0",
"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.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

10
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.2", "identity": "Microsoft.Web.WebApi.CSharp.3.0",
"shortName": "webapi", "shortName": "webapi",
"tags": { "tags": {
"language": "C#", "language": "C#",
@ -222,12 +222,12 @@
"datatype": "choice", "datatype": "choice",
"choices": [ "choices": [
{ {
"choice": "netcoreapp2.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"copyrightYear": { "copyrightYear": {
"type": "generated", "type": "generated",

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

2
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.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <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" /> <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.0</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>

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-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.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <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"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.2</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>

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.2", "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.3.0",
"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.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"HostIdentifier": { "HostIdentifier": {
"type": "bind", "type": "bind",

10
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.2", "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.3.0",
"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.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"HostIdentifier": { "HostIdentifier": {
"type": "bind", "type": "bind",

10
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.2", "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.3.0",
"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.2", "choice": "netcoreapp3.0",
"description": "Target netcoreapp2.2" "description": "Target netcoreapp3.0"
} }
], ],
"replaces": "netcoreapp2.2", "replaces": "netcoreapp3.0",
"defaultValue": "netcoreapp2.2" "defaultValue": "netcoreapp3.0"
}, },
"HostIdentifier": { "HostIdentifier": {
"type": "bind", "type": "bind",

2
test/DotNetToolsInstaller/DotNetToolsInstaller.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<RestoreProjectStyle>DotnetToolReference</RestoreProjectStyle> <RestoreProjectStyle>DotnetToolReference</RestoreProjectStyle>
</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.2"; private const string DefaultFramework = "netcoreapp3.0";
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);

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

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

6
version.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<VersionPrefix>2.2.0</VersionPrefix> <VersionPrefix>3.0.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix> <VersionSuffix>alpha1</VersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion> <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion> <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber> <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>