From a8c3615df4bc8d00789d235d026b96df43b29206 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 16 Apr 2018 23:06:05 -0700 Subject: [PATCH] React to implicit Microsoft.AspNetCore.App reference --- build/dependencies.props | 1 + .../EmptyWeb-CSharp.csproj.in | 2 +- .../EmptyWeb-FSharp.fsproj.in | 2 +- .../RazorPagesWeb-CSharp.csproj.in | 2 +- .../StarterWeb-CSharp.csproj.in | 2 +- .../StarterWeb-FSharp.fsproj.in | 2 +- .../WebApi-CSharp.csproj.in | 2 +- .../WebApi-FSharp.fsproj.in | 2 +- .../Angular-CSharp.csproj.in | 2 +- .../React-CSharp.csproj.in | 2 +- .../ReactRedux-CSharp.csproj.in | 2 +- test/GenerateTestProps.targets | 18 ++- test/TemplateTests.targets.in | 144 ++++++++++++++++++ .../Helpers/TemplateTestBase.cs | 9 +- 14 files changed, 179 insertions(+), 13 deletions(-) create mode 100644 test/TemplateTests.targets.in diff --git a/build/dependencies.props b/build/dependencies.props index 523b539c5a..a74d930051 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,6 +5,7 @@ 2.1.0-preview3-32233 2.1.0-preview3-17018 + 2.1.0-preview3-32233 2.1.0-preview3-32233 2.1.0-preview2-32233 2.1.0-preview2-32233 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 358bd58381..0db9c70633 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -10,7 +10,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index 3efe83ff4f..399acbfd58 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index eb8b56002c..abd17002dd 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -14,7 +14,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 71b0e909e6..c92d5f6d80 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -16,7 +16,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 8fafb52d33..43aa9c21f6 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -14,7 +14,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index ecb6babc39..b57b346386 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -13,7 +13,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index f7f98f5ba7..9a435ae260 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -12,7 +12,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index a8b63de9c9..020f592ccd 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -14,7 +14,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 5b0729fb12..24e96c27a4 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index db13930662..82ec5a5dd2 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -11,7 +11,7 @@ - + diff --git a/test/GenerateTestProps.targets b/test/GenerateTestProps.targets index cd27153382..18b08a5dc9 100644 --- a/test/GenerateTestProps.targets +++ b/test/GenerateTestProps.targets @@ -1,8 +1,24 @@ + + RestoreSources=$([MSBuild]::Escape($(RestoreSources))) + $(PropsProperties);RuntimeFrameworkVersion=$(RuntimeFrameworkVersion) + $(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion) + + + BundledAspNetCoreAllTargetFrameworkVersion=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1]) + $(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion) + $(TargetsProperties);BundledAspNetCoreAppTargetFrameworkVersion=$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[1]) + $(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) + + + diff --git a/test/TemplateTests.targets.in b/test/TemplateTests.targets.in new file mode 100644 index 0000000000..177e5a8721 --- /dev/null +++ b/test/TemplateTests.targets.in @@ -0,0 +1,144 @@ + + + + + + + + + + + ${BundledAspNetCoreAllPackageVersion} + + $(_TargetFrameworkVersionWithoutV) + + + + + + ${BundledAspNetCoreAppPackageVersion} + + $(_TargetFrameworkVersionWithoutV) + + + + + + + + + ${BundledAspNetCoreAllPackageVersion} + + $(_TargetFrameworkVersionWithoutV) + + + + + + + + + ${BundledAspNetCoreAppPackageVersion} + + $(_TargetFrameworkVersionWithoutV) + + + + + false + true + $(TargetLatestRuntimePatch) + + + + + $(DefaultAspNetCoreAllPatchVersion) + $(LatestAspNetCoreAllPatchVersion) + + + + + $(DefaultAspNetCoreAppPatchVersion) + $(LatestAspNetCoreAppPatchVersion) + + + + <_AspNetCoreAllPackageName>Microsoft.AspNetCore.All + <_AspNetCoreAppPackageName>Microsoft.AspNetCore.App + + + + + <_AspNetCoreAllReference Include="@(PackageReference->WithMetadataValue('Identity', '$(_AspNetCoreAllPackageName)'))" /> + <_ExplicitAspNetCoreAllReference Include="@(_AspNetCoreAllReference->HasMetadata('Version'))" /> + <_AspNetCoreAppReference Include="@(PackageReference->WithMetadataValue('Identity', '$(_AspNetCoreAppPackageName)'))" /> + <_ExplicitAspNetCoreAppReference Include="@(_AspNetCoreAppReference->HasMetadata('Version'))" /> + + + + $(AspNetCoreAllRuntimeFrameworkVersion) + true + All + true + + + $(AspNetCoreAppRuntimeFrameworkVersion) + true + All + true + + + + + + + + + + diff --git a/test/Templates.Test/Helpers/TemplateTestBase.cs b/test/Templates.Test/Helpers/TemplateTestBase.cs index 96443c9f01..c93cd5d17b 100644 --- a/test/Templates.Test/Helpers/TemplateTestBase.cs +++ b/test/Templates.Test/Helpers/TemplateTestBase.cs @@ -42,14 +42,19 @@ namespace Templates.Test // Directory.Build.props/targets context var templatesTestsPropsFilePath = Path.Combine(basePath, "TemplateTests.props"); + var templatesTestsTargetsFilePath = Path.Combine(basePath, "TemplateTests.targets"); var directoryBuildPropsContent = $@" "; - File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.props"), directoryBuildPropsContent); - File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.targets"), ""); + + var directoryBuildTargetsContent = +$@" + +"; + File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.targets"), directoryBuildTargetsContent); } protected void InstallTemplatePackages()