mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6997 from nguerrera/loc-compilers

Browse source 
Add F# and Roslyn satellites
This commit is contained in:
Nick Guerrera 2017-06-26 11:10:49 -07:00 committed by GitHub
commit b8a2ce4e8c
8 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/DependencyVersions.props
View file

@ -4,8 +4,10 @@
<CLI_SharedFrameworkVersion>2.0.0-preview3-25419-01</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.3.0-preview-000400-01</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.3.0-beta3-61816-04</CLI_Roslyn_Version>
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170624-6</CLI_Roslyn_Satellites_Version>
<CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
<CLI_FSharp_Version>4.2.0-rc-170602-0</CLI_FSharp_Version>
<CLI_FSharp_Satellites_Version>4.4.1-pre-20170624-6</CLI_FSharp_Satellites_Version>
<!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
cases, so use separate properties but derive one from the other unless we want to

1
src/tool_fsharp/tool_fsc.csproj
View file

@ -13,6 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
<PackageReference Include="Microsoft.FSharp.Compiler" Version="$(CLI_FSharp_Version)" />
<PackageReference Include="CliDeps.Satellites.FSharp" Version="$(CLI_FSharp_Satellites_Version)" />
</ItemGroup>
<ItemGroup>

1
src/tool_roslyn/tool_roslyn.csproj
View file

@ -17,6 +17,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="$(CLI_Roslyn_Version)" />
<PackageReference Include="Microsoft.Net.Compilers.netcore" Version="$(CLI_Roslyn_Version)" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(CLI_DiaSymNative_Version)" />
<PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CLI_Roslyn_Satellites_Version)" />
</ItemGroup>
<ItemGroup>

2
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
View file

@ -82,7 +82,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
.WithWorkingDirectory(testInstance.Root)
.ExecuteWithCapturedOutput("--no-restore")
.Should().Fail()
.And.HaveStdOutContaining("project.assets.json' not found.");;
.And.HaveStdOutContaining("project.assets.json");
}
[Fact]

2
test/dotnet-pack.Tests/PackTests.cs
View file

@ -197,7 +197,7 @@ namespace Microsoft.DotNet.Tools.Pack.Tests
.WithWorkingDirectory(testInstance.Root)
.ExecuteWithCapturedOutput("--no-restore")
.Should().Fail()
.And.HaveStdOutContaining("project.assets.json' not found.");;
.And.HaveStdOutContaining("project.assets.json");
}
[Fact]

2
test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
View file

@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--framework netcoreapp2.0 --no-restore")
.Should().Fail()
.And.HaveStdOutContaining("project.assets.json' not found.");;
.And.HaveStdOutContaining("project.assets.json");
}
[Fact]

2
test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
View file

@ -87,7 +87,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--no-restore")
.Should().Fail()
.And.HaveStdOutContaining("project.assets.json' not found.");;
.And.HaveStdOutContaining("project.assets.json");
}
[Fact]

2
test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
View file

@ -73,7 +73,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput($"{TestBase.ConsoleLoggerOutputNormal} --no-restore")
.Should().Fail()
.And.HaveStdOutContaining("project.assets.json' not found.");;
.And.HaveStdOutContaining("project.assets.json");
}
[Fact]