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

Update tests to target netcoreapp2.1

This commit is contained in:
Pranav K 2018-04-21 10:45:07 -07:00
parent a6a5e4ea10
commit 1e2a1405e5
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
9 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
View File

@ -27,7 +27,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\$(TaskProject)\$(TaskProject).csproj" ReferenceOutputAssembly="false" /> <ProjectReference Include="..\$(TaskProject)\$(TaskProject).csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(ToolProject)" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp2.0'" /> <ProjectReference Include="$(ToolProject)" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
</ItemGroup> </ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec"> <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec">

2
src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
View File

@ -72,7 +72,6 @@
ToolAssembly="$(_RazorToolAssembly)" ToolAssembly="$(_RazorToolAssembly)"
UseServer="$(UseRazorBuildServer)" UseServer="$(UseRazorBuildServer)"
ForceServer="$(_RazorForceBuildServer)" ForceServer="$(_RazorForceBuildServer)"
SuppressCurrentUserOnlyPipeOptions="$(_RazorSuppressCurrentUserOnlyPipeOptions)"
PipeName="$(_RazorBuildServerPipeName)" PipeName="$(_RazorBuildServerPipeName)"
Version="$(RazorLangVersion)" Version="$(RazorLangVersion)"
Configuration="@(ResolvedRazorConfiguration)" Configuration="@(ResolvedRazorConfiguration)"
@ -124,7 +123,6 @@
ToolAssembly="$(_RazorToolAssembly)" ToolAssembly="$(_RazorToolAssembly)"
UseServer="$(UseRazorBuildServer)" UseServer="$(UseRazorBuildServer)"
ForceServer="$(_RazorForceBuildServer)" ForceServer="$(_RazorForceBuildServer)"
SuppressCurrentUserOnlyPipeOptions="$(_RazorSuppressCurrentUserOnlyPipeOptions)"
PipeName="$(_RazorBuildServerPipeName)" PipeName="$(_RazorBuildServerPipeName)"
Version="$(RazorLangVersion)" Version="$(RazorLangVersion)"
Configuration="@(ResolvedRazorConfiguration)" Configuration="@(ResolvedRazorConfiguration)"

2
test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/InitializeTestProjectAttribute.cs
View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
} }
MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language); MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp2.0"; MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp2.1";
} }
public override void After(MethodInfo methodUnderTest) public override void After(MethodInfo methodUnderTest)

5
test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildIntegrationTestBase.cs
View File

@ -77,11 +77,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
if (!suppressBuildServer) if (!suppressBuildServer)
{ {
buildArgumentList.Add($"/p:_RazorBuildServerPipeName={buildServerPipeName ?? BuildServer.PipeName}"); buildArgumentList.Add($"/p:_RazorBuildServerPipeName={buildServerPipeName ?? BuildServer.PipeName}");
// The build server will not be used in netcoreapp2.0 because PipeOptions.CurrentUserOnly is not available.
// But we still want to make sure to run the tests on the server. So suppress that check.
// This can be removed once https://github.com/aspnet/Razor/issues/2237 is done.
buildArgumentList.Add($"/p:_RazorSuppressCurrentUserOnlyPipeOptions=true");
} }
if (!string.IsNullOrEmpty(target)) if (!string.IsNullOrEmpty(target))

2
test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj
View File

@ -7,7 +7,7 @@
This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project
has netcoreapp2.0 dependencies that need to be built first. has netcoreapp2.0 dependencies that need to be built first.
--> -->
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants> <DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants>
<!-- Copy references locally so that we can use them in the test. --> <!-- Copy references locally so that we can use them in the test. -->

2
test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
View File

@ -12,7 +12,7 @@
<Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" /> <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<!-- Test Placeholder --> <!-- Test Placeholder -->

2
test/testapps/SimpleMvc/SimpleMvc.csproj
View File

@ -13,7 +13,7 @@
<Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" /> <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<!-- Test Placeholder --> <!-- Test Placeholder -->

2
test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
View File

@ -13,7 +13,7 @@
<Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" /> <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
test/testapps/SimplePages/SimplePages.csproj
View File

@ -13,7 +13,7 @@
<Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" /> <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<!-- Test Placeholder --> <!-- Test Placeholder -->