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

Merge branch 'release/3.0-preview3' 

\n\nCommit migrated from ce4813df7d
This commit is contained in:
Nate McMaster 2019-02-22 10:26:10 -08:00
parent 81ac40e82d 61e85256a6
commit d05aa84ec3
5 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Razor/Microsoft.NET.Sdk.Razor/test/BuildVariables.cs
View File

@ -7,7 +7,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
{
private static string _msBuildPath = string.Empty;
private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
private static string _netStandardLibrary20PackageVersion = string.Empty;
static partial void InitializeVariables();
@ -28,14 +27,5 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
return _microsoftNETCoreApp30PackageVersion;
}
}
public static string NETStandardLibrary20PackageVersion
{
get
{
InitializeVariables();
return _netStandardLibrary20PackageVersion;
}
}
}
}

1
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs
View File

@ -74,7 +74,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
"/p:RunningAsTest=true",
$"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
$"/p:NETStandardLibrary20PackageVersion={BuildVariables.NETStandardLibrary20PackageVersion}",
};
if (!suppressRestore)

1
src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
View File

@ -73,7 +73,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
{
_msBuildPath = @"$(_DesktopMSBuildPath)";
_microsoftNETCoreApp30PackageVersion = "$(MicrosoftNETCoreApp30PackageVersion)";
_netStandardLibrary20PackageVersion = "$(NETStandardLibrary20PackageVersion)";
}
}
}

2
src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
View File

@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup>
</Project>

5
src/Razor/test/testassets/Directory.Build.props
View File

@ -13,11 +13,6 @@
</PropertyGroup>
<PropertyGroup>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<NETStandardImplicitPackageVersion>$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
<!-- Working around an issue in XDT transforms -->
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
</PropertyGroup>