8000 Merge branch 'master' into omnisharp-compability · dotnet-script/dotnet-script@e2412f8 · GitHub
[go: up one dir, main page]
Skip to content

Commit e2412f8

Browse files
seesharpe 8000 rseesharper
authored
Merge branch 'master' into omnisharp-compability
2 parents 783dd42 + 8577e2b commit e2412f8

File tree

2 files changed

+4
-45
lines changed

2 files changed

+4
-45
lines changed

‎build/netfx.props

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
<PropertyGroup>
44
<TargetFramework>net461</TargetFramework>
55
</PropertyGroup>
6-
7-
<Import Project="../../build/netfx.props" />
8-
9-
<ItemGroup>
6+
<ItemGroup>
107
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
118
<PackageReference Include="xunit" Version="2.4.1" />
129
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1310
<PrivateAssets>all</PrivateAssets>
1411
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
15-
</PackageReference>
12+
</PackageReference>
1613
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
14+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All"/>
1715
</ItemGroup>
1816

1917
<ItemGroup>
@@ -27,5 +25,5 @@
2725
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2826
</Content>
2927
</ItemGroup>
30-
28+
3129
</Project>

0 commit comments

Comments
 (0)
0