Skip to content
This repository was archived by the owner on Dec 20, 2018. It is now read-only.

Commit 727bd52

Browse files
natemcmasternatemcmaster
authored
Add package version to Microsoft.AspNetCore.App in project templates
As discussed in dotnet/aspnetcore#3292, we're reversing course on the implicit package version feature. This adds a package version for Microsoft.AspNetCore.App to the `dotnet new` and VS templates.
1 parent a6b303c commit 727bd52

21 files changed

+46
-228
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ node_modules
3737
.vscode
3838
global.json
3939
.idea/
40+
*.binlog

‎Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
43
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
54
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
65
</PropertyGroup>
7-
</Project>
6+
</Project>

‎build/dependencies.props

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,39 @@
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
66
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
7-
<DotNetEfPackageVersion>2.1.1</DotNetEfPackageVersion>
8-
<InternalAspNetCoreSdkPackageVersion>2.1.1-rtm-15793</InternalAspNetCoreSdkPackageVersion>
9-
<MicrosoftAspNetCoreAllPackageVersion>2.1.1</MicrosoftAspNetCoreAllPackageVersion>
10-
<MicrosoftAspNetCoreAppPackageVersion>2.1.1</MicrosoftAspNetCoreAppPackageVersion>
11-
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
12-
<MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>
13-
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
14-
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
15-
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
16-
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
17-
<MicrosoftAspNetCoreCookiePolicyPackageVersion>2.1.1</MicrosoftAspNetCoreCookiePolicyPackageVersion>
18-
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.1.1</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
19-
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.1</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
20-
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.1.1</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
21-
<MicrosoftAspNetCoreIdentityUIPackageVersion>2.1.1</MicrosoftAspNetCoreIdentityUIPackageVersion>
22-
<MicrosoftAspNetCoreMvcPackageVersion>2.1.1</MicrosoftAspNetCoreMvcPackageVersion>
23-
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.1</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
24-
<MicrosoftAspNetCorePackageVersion>2.1.1</MicrosoftAspNetCorePackageVersion>
25-
<MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.1.1</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>
26-
<MicrosoftAspNetCoreSpaServicesPackageVersion>2.1.1</MicrosoftAspNetCoreSpaServicesPackageVersion>
27-
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.1</MicrosoftAspNetCoreStaticFilesPackageVersion>
7+
<DotNetEfPackageVersion>2.1.2-rtm-30874</DotNetEfPackageVersion>
8+
<InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15796</InternalAspNetCoreSdkPackageVersion>
9+
<MicrosoftAspNetCoreAppPackageVersion>2.1.3-rtm-30874</MicrosoftAspNetCoreAppPackageVersion>
10+
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
11+
<MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>
12+
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
13+
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
14+
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
15+
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
16+
<MicrosoftAspNetCoreCookiePolicyPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreCookiePolicyPackageVersion>
17+
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
18+
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
19+
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.1.3-rtm-30874</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
20+
<MicrosoftAspNetCoreIdentityUIPackageVersion>2.1.3-rtm-30874</MicrosoftAspNetCoreIdentityUIPackageVersion>
21+
<MicrosoftAspNetCoreMvcPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreMvcPackageVersion>
22+
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
23+
<MicrosoftAspNetCorePackageVersion>2.1.3-rtm-30874</MicrosoftAspNetCorePackageVersion>
24+
<MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>
25+
<MicrosoftAspNetCoreSpaServicesPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreSpaServicesPackageVersion>
26+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.2-rtm-30874</MicrosoftAspNetCoreStaticFilesPackageVersion>
2827
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0</MicrosoftAspNetCoreTestingPackageVersion>
2928
<MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
3029
<MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
31-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
32-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
33-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
34-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
35-
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.1</MicrosoftExtensionsProcessSourcesPackageVersion>
36-
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
30+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.2-rtm-30874</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
31+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.2-rtm-30874</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
32+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.2-rtm-30874</MicrosoftEntityFrameworkCoreToolsPackageVersion>
33+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.2-rtm-30874</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
34+
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.2-rtm-30874</MicrosoftExtensionsProcessSourcesPackageVersion>
3735
<MicrosoftNETCoreApp21PackageVersion>2.1.1</MicrosoftNETCoreApp21PackageVersion>
38-
<MicrosoftNETSdkRazorPackageVersion>2.1.1</MicrosoftNETSdkRazorPackageVersion>
36+
<MicrosoftNETSdkRazorPackageVersion>2.1.2-rtm-30874</MicrosoftNETSdkRazorPackageVersion>
3937
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
40-
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.1</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
41-
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.1.1</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
38+
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.2-rtm-30874</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
39+
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.1.2-rtm-30874</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
4240
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
4341
<SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion>
4442
<SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion>

‎build/repo.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
1313

1414
<!-- SkipAspNetCoreRuntimeInstall must be set when building templates before the shared framework is available -->
15-
<AspNetCoreRuntime Include="$(MicrosoftAspNetCoreAllPackageVersion)"
15+
<AspNetCoreRuntime Include="$(MicrosoftAspNetCoreAppPackageVersion)"
1616
Condition=" '$(SkipAspNetCoreRuntimeInstall)' != 'true' " />
1717
</ItemGroup>
1818

‎korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.1-rtm-15793
2-
commithash:988313f4b064d6c69fc6f7b845b6384a6af3447a
1+
version:2.1.3-rtm-15796
2+
commithash:bb5fcc49ee843d3be2ebd4cc879658db55fc79da

‎src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
13-
<PackageReference Include="Microsoft.AspNetCore.App" />
13+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1414
</ItemGroup>
1515
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
1616
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />

‎src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
14-
<PackageReference Include="Microsoft.AspNetCore.App" />
14+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1515
</ItemGroup>
1616
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
1717
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />

‎src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!-- Set this last to ensure the properties get the final versions which may be overridden by CI. -->
1414
<PropertyGroup>
1515
<GeneratedContentProperties>
16-
MicrosoftAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion);
16+
MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
1717
MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion=$(MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion);
1818
MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion=$(MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion);
1919
MicrosoftAspNetCoreAuthenticationCookiesPackageVersion=$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion);

‎src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
19-
<PackageReference Include="Microsoft.AspNetCore.App" />
19+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
2020
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
2121
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />

‎src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
19-
<PackageReference Include="Microsoft.AspNetCore.App" />
19+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
2020
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
2121
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />

‎src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
17-
<PackageReference Include="Microsoft.AspNetCore.App" />
17+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1818
</ItemGroup>
1919
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
2020
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />

‎src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
16-
<PackageReference Include="Microsoft.AspNetCore.App" />
16+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1717
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
1818
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
1919
</ItemGroup>

‎src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
15-
<PackageReference Include="Microsoft.AspNetCore.App" />
15+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
1818
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />

‎src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
17-
<PackageReference Include="Microsoft.AspNetCore.App" />
17+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1818
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
1919
</ItemGroup>
2020
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">

‎src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!-- Set this last to ensure the properties get the final versions which may be overridden by CI. -->
1414
<PropertyGroup>
1515
<GeneratedContentProperties>
16-
MicrosoftAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion);
16+
MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
1717
MicrosoftAspNetCorePackageVersion=$(MicrosoftAspNetCorePackageVersion);
1818
MicrosoftAspNetCoreHttpsPolicyPackageVersion=$(MicrosoftAspNetCoreHttpsPolicyPackageVersion);
1919
MicrosoftAspNetCoreMvcPackageVersion=$(MicrosoftAspNetCoreMvcPackageVersion);

‎src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
14-
<PackageReference Include="Microsoft.AspNetCore.App" />
14+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1515
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">

‎src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
14-
<PackageReference Include="Microsoft.AspNetCore.App" />
14+
<PackageReference Include="Microsoft.AspNetCore.App" Version="${MicrosoftAspNetCoreAppPackageVersion}" />
1515
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">

‎test/GenerateTestProps.targets

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,11 @@
44
<PropsProperties>RestoreSources=$([MSBuild]::Escape($(RestoreSources)))</PropsProperties>
55
<PropsProperties>$(PropsProperties);RuntimeFrameworkVersion=$(RuntimeFrameworkVersion)</PropsProperties>
66
<PropsProperties>$(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion)</PropsProperties>
7-
8-
<!-- This logic would be in the CLI -->
9-
<DefaultPatchVersionForAspNetCoreAll2_1>2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
10-
<DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(MicrosoftAspNetCoreAllPackageVersion.StartsWith('$(DefaultPatchVersionForAspNetCoreAll2_1)'))">$(MicrosoftAspNetCoreAllPackageVersion)</DefaultPatchVersionForAspNetCoreAll2_1>
11-
<DefaultPatchVersionForAspNetCoreApp2_1>$(DefaultPatchVersionForAspNetCoreAll2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
12-
<DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(MicrosoftAspNetCoreAppPackageVersion.StartsWith('$(DefaultPatchVersionForAspNetCoreApp2_1)'))">$(MicrosoftAspNetCoreAppPackageVersion)</DefaultPatchVersionForAspNetCoreApp2_1>
13-
14-
<PropsProperties>$(PropsProperties);DefaultPatchVersionForAspNetCoreAll2_1=$(DefaultPatchVersionForAspNetCoreAll2_1)</PropsProperties>
15-
<PropsProperties>$(PropsProperties);DefaultPatchVersionForAspNetCoreApp2_1=$(DefaultPatchVersionForAspNetCoreApp2_1)</PropsProperties>
16-
17-
<!-- These properties would normally be bundled in the CLI -->
18-
<TargetsProperties>BundledAspNetCoreAllTargetFrameworkVersion=$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAllPackageVersion.Split('.')[1])</TargetsProperties>
19-
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion)</TargetsProperties>
20-
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAppTargetFrameworkVersion=$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[1])</TargetsProperties>
21-
<TargetsProperties>$(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion)</TargetsProperties>
227
</PropertyGroup>
238

249
<Sdk_GenerateFileFromTemplate
2510
TemplateFile="$(MSBuildThisFileDirectory)TemplateTests.props.in"
2611
Properties="$(PropsProperties)"
2712
OutputPath="$(OutputPath)TemplateTests.props" />
28-
<Sdk_GenerateFileFromTemplate
29-
TemplateFile="$(MSBuildThisFileDirectory)TemplateTests.targets.in"
30-
Properties="$(TargetsProperties)"
31-
OutputPath="$(OutputPath)TemplateTests.targets" />
3213
</Target>
3314
</Project>

‎test/TemplateTests.props.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
<RestoreSources>${RestoreSources}</RestoreSources>
55
<RuntimeFrameworkVersion>${RuntimeFrameworkVersion}</RuntimeFrameworkVersion>
66
<MicrosoftNETSdkRazorPackageVersion>${MicrosoftNETSdkRazorPackageVersion}</MicrosoftNETSdkRazorPackageVersion>
7-
<DefaultPatchVersionForAspNetCoreAll2_1>${DefaultPatchVersionForAspNetCoreAll2_1}</DefaultPatchVersionForAspNetCoreAll2_1>
8-
<DefaultPatchVersionForAspNetCoreApp2_1>${DefaultPatchVersionForAspNetCoreApp2_1}</DefaultPatchVersionForAspNetCoreApp2_1>
97
</PropertyGroup>
108
</Project>

0 commit comments

Comments
 (0)