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

Update implementation

This commit is contained in:
John Luo 2018-05-30 17:15:48 -07:00
parent 48782f9718
commit d2025d516c
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/GenerateTestProps.targets
View File

@ -5,6 +5,15 @@
<PropsProperties>$(PropsProperties);RuntimeFrameworkVersion=$(RuntimeFrameworkVersion)</PropsProperties> <PropsProperties>$(PropsProperties);RuntimeFrameworkVersion=$(RuntimeFrameworkVersion)</PropsProperties>
<PropsProperties>$(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion)</PropsProperties> <PropsProperties>$(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion)</PropsProperties>
<!-- This logic would be in the CLI -->
<DefaultPatchVersionForAspNetCoreAll2_1>2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
<DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(MicrosoftAspNetCoreAllPackageVersion.StartsWith('$(DefaultPatchVersionForAspNetCoreAll2_1)'))">$(MicrosoftAspNetCoreAllPackageVersion)</DefaultPatchVersionForAspNetCoreAll2_1>
<DefaultPatchVersionForAspNetCoreApp2_1>$(DefaultPatchVersionForAspNetCoreAll2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
<DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(MicrosoftAspNetCoreAppPackageVersion.StartsWith('$(DefaultPatchVersionForAspNetCoreApp2_1)'))">$(MicrosoftAspNetCoreAppPackageVersion)</DefaultPatchVersionForAspNetCoreApp2_1>
<PropsProperties>$(PropsProperties);DefaultPatchVersionForAspNetCoreAll2_1=$(DefaultPatchVersionForAspNetCoreAll2_1)</PropsProperties>
<PropsProperties>$(PropsProperties);DefaultPatchVersionForAspNetCoreApp2_1=$(DefaultPatchVersionForAspNetCoreApp2_1)</PropsProperties>
<!-- These properties would normally be bundled in the CLI --> <!-- These properties would normally be bundled in the CLI -->
<TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1])</TargetsProperties> <TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1])</TargetsProperties>
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion)</TargetsProperties> <TargetsProperties>$(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion)</TargetsProperties>

2
test/TemplateTests.props.in
View File

@ -4,5 +4,7 @@
<RestoreSources>${RestoreSources}</RestoreSources> <RestoreSources>${RestoreSources}</RestoreSources>
<RuntimeFrameworkVersion>${RuntimeFrameworkVersion}</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>${RuntimeFrameworkVersion}</RuntimeFrameworkVersion>
<MicrosoftNETSdkRazorPackageVersion>${MicrosoftNETSdkRazorPackageVersion}</MicrosoftNETSdkRazorPackageVersion> <MicrosoftNETSdkRazorPackageVersion>${MicrosoftNETSdkRazorPackageVersion}</MicrosoftNETSdkRazorPackageVersion>
<DefaultPatchVersionForAspNetCoreAll2_1>${DefaultPatchVersionForAspNetCoreAll2_1}</DefaultPatchVersionForAspNetCoreAll2_1>
<DefaultPatchVersionForAspNetCoreApp2_1>${DefaultPatchVersionForAspNetCoreApp2_1}</DefaultPatchVersionForAspNetCoreApp2_1>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

10
test/TemplateTests.targets.in
View File

@ -37,9 +37,15 @@ Copyright (c) .NET Foundation. All rights reserved.
<Choose> <Choose>
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" > <When Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" >
<PropertyGroup>
<!-- These properties will allow the latest patch versions to be set in the CLI (via BundledVersions.props) or overridden by tests -->
<DefaultPatchVersionForAspNetCoreAll2_1 Condition="'$(DefaultPatchVersionForAspNetCoreAll2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
<DefaultPatchVersionForAspNetCoreApp2_1 Condition="'$(DefaultPatchVersionForAspNetCoreApp2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreApp2_1>
</PropertyGroup>
<!-- Default patch version of .All Framework --> <!-- Default patch version of .All Framework -->
<PropertyGroup Condition="'$(DefaultAspNetCoreAllPatchVersion)' == ''"> <PropertyGroup Condition="'$(DefaultAspNetCoreAllPatchVersion)' == ''">
<DefaultAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">2.1.1</DefaultAspNetCoreAllPatchVersion> <DefaultAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(DefaultPatchVersionForAspNetCoreAll2_1)</DefaultAspNetCoreAllPatchVersion>
<!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version <!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props --> provided by Microsoft.NETCoreSdk.BundledVersions.props -->
@ -50,7 +56,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Default patch version of .App Framework --> <!-- Default patch version of .App Framework -->
<PropertyGroup Condition="'$(DefaultAspNetCoreAppPatchVersion)' == ''"> <PropertyGroup Condition="'$(DefaultAspNetCoreAppPatchVersion)' == ''">
<DefaultAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">2.1.1</DefaultAspNetCoreAppPatchVersion> <DefaultAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(DefaultPatchVersionForAspNetCoreApp2_1)</DefaultAspNetCoreAppPatchVersion>
<!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version <!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props --> provided by Microsoft.NETCoreSdk.BundledVersions.props -->