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

Remove RuntimeFrameworkVersion from the templates 

This property is no longer needed because the Microsoft.AspNetCore.All and .App packages set the shared framework version. RuntimeFrameworkVersion is inferred by Microsoft.NET.Sdk
This commit is contained in:
Nate McMaster 2018-01-25 10:19:08 -08:00 committed by Nate McMaster
parent 222e3ccbb9
commit 04dfc5cc6b
23 changed files with 0 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/dependencies.props
View File

@ -36,7 +36,6 @@
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.0-preview1-28163</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.1.0-preview1-28163</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
<MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion>2.1.0-preview1-28163</MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion>
<NETStandardLibraryPackageVersion>2.0.0</NETStandardLibraryPackageVersion>
<SeleniumFirefoxWebDriverPackageVersion>0.19.0</SeleniumFirefoxWebDriverPackageVersion>
<SeleniumSupportPackageVersion>3.7.0</SeleniumSupportPackageVersion>
<SeleniumWebDriverMicrosoftDriverPackageVersion>16.16299.0</SeleniumWebDriverMicrosoftDriverPackageVersion>

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

@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>

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

@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>

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

@ -33,8 +33,6 @@
MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion);
MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion);
MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion);
MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion);
NETStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion);
</GeneratedContentProperties>
</PropertyGroup>

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

@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>

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

@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>

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

@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

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

@ -3,9 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>

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

@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${MicrosoftNETCoreApp21PackageVersion}</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">${NETStandardLibraryPackageVersion}</NETStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>

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

@ -22,11 +22,6 @@
"ExcludeLaunchSettings": {
"longName": "exclude-launch-settings",
"shortName": ""
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -41,12 +41,6 @@
}
],
"symbols": {
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"ExcludeLaunchSettings": {
"type": "parameter",
"datatype": "bool",

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

@ -22,11 +22,6 @@
"ExcludeLaunchSettings": {
"longName": "exclude-launch-settings",
"shortName": ""
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -37,12 +37,6 @@
}
],
"symbols": {
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"ExcludeLaunchSettings": {
"type": "parameter",
"datatype": "bool",

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

@ -76,11 +76,6 @@
"UseBrowserLink": {
"longName": "use-browserlink",
"shortName": ""
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -89,12 +89,6 @@
}
],
"symbols": {
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"auth": {
"type": "parameter",
"datatype": "choice",

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

@ -76,11 +76,6 @@
"UseBrowserLink": {
"longName": "use-browserlink",
"shortName": ""
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -84,12 +84,6 @@
}
],
"symbols": {
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"auth": {
"type": "parameter",
"datatype": "choice",

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

@ -22,11 +22,6 @@
"skipRestore": {
"longName": "no-restore",
"shortName": ""
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -38,12 +38,6 @@
}
],
"symbols": {
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"ExcludeLaunchSettings": {
"type": "parameter",
"datatype": "bool",

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

@ -56,11 +56,6 @@
},
"UserSecretsId": {
"isHidden": true
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -62,12 +62,6 @@
}
],
"symbols": {
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"auth": {
"type": "parameter",
"datatype": "choice",

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

@ -22,11 +22,6 @@
"skipRestore": {
"longName": "no-restore",
"shortName": ""
},
"RuntimeFrameworkVersion": {
"longName": "runtime-framework-version",
"shortName": "fv",
"isHidden": "true"
}
},
"usageExamples": [

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

@ -83,12 +83,6 @@
},
"replaces": "44300"
},
"RuntimeFrameworkVersion": {
"type": "parameter",
"replaces": "2.1.0-preview2-25624-02",
"datatype": "string",
"defaultValue": "2.1.0-preview2-25624-02"
},
"TargetFrameworkOverride": {
"type": "parameter",
"description": "Overrides the target framework",