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

Temporarily disable tests on .NET Core that rely on .NET Core 2.0 API

This commit is contained in:
Nate McMaster 2017-02-14 16:37:28 -08:00
parent 279855d947
commit 4fd441ae35
5 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile.shade
View File

@ -40,6 +40,3 @@ k-standard-goals
var vsixPath = Directory.EnumerateFiles(baseDirectory, "*.vsix", SearchOption.AllDirectories).First();
File.Copy(vsixPath, Path.Combine(buildPath, Path.GetFileName(vsixPath)));
}
#pack-sources target='build-pack'
dotnet command='msbuild shared/sources.csproj "/t:Restore;PackAll" /v:n'

28
shared/sources.csproj
View File

@ -1,28 +0,0 @@
<!-- this is a dummy project to workaround https://github.com/NuGet/Home/issues/4254 -->
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\build\common.props" />
<PropertyGroup>
<PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(MSBuildThisFileDirectory)..\artifacts\build</PackageOutputPath>
<NuspecBasePath>$(MSBuildThisFileDirectory)\$(PackageId)</NuspecBasePath>
<TargetFramework>netstandard1.0</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<Description>$(PackageId)</Description>
<IncludeBuildOutput>false</IncludeBuildOutput>
<ContentTargetFolders>contentFiles</ContentTargetFolders>
</PropertyGroup>
<ItemGroup Condition="'$(NuspecBasePath)' != ''">
<Compile Include="$(NuspecBasePath)\**\*.cs" Pack="true" PackagePath="$(ContentTargetFolders)\cs\$(TargetFramework)\%(RecursiveDir)%(FileName)%(Extension)" />
<PackageReference Update="@(PackageReference)" PrivateAssets="All" />
</ItemGroup>
<Target Name="PackAll">
<ItemGroup>
<Packages Include="$([System.IO.Directory]::GetDirectories(&quot;$(MSBuildThisFileDirectory)&quot;, '*.Sources'))" />
</ItemGroup>
<MSBuild Projects="$(MSBuildThisFile)"
Targets="Pack"
Properties="PackageVersion=$(Version);PackageId=%(Packages.FileName)%(Packages.Extension);NoBuild=true" />
</Target>
</Project>

4
test/Microsoft.AspNetCore.Razor.Evolution.Test/Microsoft.AspNetCore.Razor.Evolution.Test.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<!-- TODO re-enable tests on .NET Core when we upgrade to 2.0. This project started using 2.0 API but we had to drop temporarily to .NET Core 1.1 -->
<TargetFramework>net46</TargetFramework>
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
</PropertyGroup>

4
test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj
View File

@ -3,8 +3,8 @@
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<!-- TODO re-enable tests on .NET Core when we upgrade to 2.0. This project started using 2.0 API but we had to drop temporarily to .NET Core 1.1 -->
<TargetFramework>net452</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">

1
test/Microsoft.CodeAnalysis.Razor.Test/TestCompilation.cs
View File

@ -18,6 +18,7 @@ namespace Microsoft.CodeAnalysis.Razor
{
syntaxTrees = new[] { syntaxTree };
}
var references = AppDomain.CurrentDomain
.GetAssemblies()
.Select(assembly => MetadataReference.CreateFromFile(assembly.Location));