Temporarily disable tests on .NET Core that rely on .NET Core 2.0 API
This commit is contained in:
parent
279855d947
commit
4fd441ae35
|
|
@ -40,6 +40,3 @@ k-standard-goals
|
||||||
var vsixPath = Directory.EnumerateFiles(baseDirectory, "*.vsix", SearchOption.AllDirectories).First();
|
var vsixPath = Directory.EnumerateFiles(baseDirectory, "*.vsix", SearchOption.AllDirectories).First();
|
||||||
File.Copy(vsixPath, Path.Combine(buildPath, Path.GetFileName(vsixPath)));
|
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'
|
|
||||||
|
|
|
||||||
|
|
@ -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("$(MSBuildThisFileDirectory)", '*.Sources'))" />
|
|
||||||
</ItemGroup>
|
|
||||||
<MSBuild Projects="$(MSBuildThisFile)"
|
|
||||||
Targets="Pack"
|
|
||||||
Properties="PackageVersion=$(Version);PackageId=%(Packages.FileName)%(Packages.Extension);NoBuild=true" />
|
|
||||||
</Target>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Import Project="..\..\build\common.props" />
|
<Import Project="..\..\build\common.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netcoreapp1.1;net46</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 -->
|
||||||
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
|
<TargetFramework>net46</TargetFramework>
|
||||||
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
|
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
||||||
<TargetFrameworks>netcoreapp1.1;net452</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 -->
|
||||||
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
|
<TargetFramework>net452</TargetFramework>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ namespace Microsoft.CodeAnalysis.Razor
|
||||||
{
|
{
|
||||||
syntaxTrees = new[] { syntaxTree };
|
syntaxTrees = new[] { syntaxTree };
|
||||||
}
|
}
|
||||||
|
|
||||||
var references = AppDomain.CurrentDomain
|
var references = AppDomain.CurrentDomain
|
||||||
.GetAssemblies()
|
.GetAssemblies()
|
||||||
.Select(assembly => MetadataReference.CreateFromFile(assembly.Location));
|
.Select(assembly => MetadataReference.CreateFromFile(assembly.Location));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue