Merge pull request #6743 from KevinRansom/release/2.0.0
This updates the F# compiler to the latest nuget published build.
This commit is contained in:
commit
ac3ed6fbe6
4 changed files with 11 additions and 27 deletions
|
@ -5,7 +5,7 @@
|
||||||
<CLI_MSBuild_Version>15.3.0-preview-000246-05</CLI_MSBuild_Version>
|
<CLI_MSBuild_Version>15.3.0-preview-000246-05</CLI_MSBuild_Version>
|
||||||
<CLI_Roslyn_Version>2.3.0-beta2-61716-09</CLI_Roslyn_Version>
|
<CLI_Roslyn_Version>2.3.0-beta2-61716-09</CLI_Roslyn_Version>
|
||||||
<CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
|
<CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
|
||||||
<CLI_FSharp_Version>1.0.0-rc-170511-0</CLI_FSharp_Version>
|
<CLI_FSharp_Version>4.2.0-rc-170602-0</CLI_FSharp_Version>
|
||||||
<CLI_NETSDK_Version>2.0.0-preview2-20170602-1</CLI_NETSDK_Version>
|
<CLI_NETSDK_Version>2.0.0-preview2-20170602-1</CLI_NETSDK_Version>
|
||||||
<CLI_NuGet_Version>4.3.0-preview2-4095</CLI_NuGet_Version>
|
<CLI_NuGet_Version>4.3.0-preview2-4095</CLI_NuGet_Version>
|
||||||
<CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
|
<CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
|
||||||
|
|
|
@ -226,6 +226,7 @@
|
||||||
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
|
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
|
||||||
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunCsc.sh" />
|
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunCsc.sh" />
|
||||||
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunVbc.sh" />
|
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunVbc.sh" />
|
||||||
|
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="CreateSymbolsDirectory"
|
<Target Name="CreateSymbolsDirectory"
|
||||||
|
|
|
@ -12,12 +12,12 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
|
<PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
|
||||||
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="$(CLI_FSharp_Version)" />
|
<PackageReference Include="Microsoft.FSharp.Compiler" Version="$(CLI_FSharp_Version)" />
|
||||||
<PackageReference Include="Microsoft.FSharp.Compiler.netcore" Version="$(CLI_FSharp_Version)" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="RunFsc.sh;RunFsc.cmd">
|
<Content Include="RunFsc.sh;RunFsc.cmd">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -35,25 +35,9 @@
|
||||||
SectionName="%(AssetsToRemoveFromDeps.SectionName)"
|
SectionName="%(AssetsToRemoveFromDeps.SectionName)"
|
||||||
AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
|
AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
|
||||||
|
|
||||||
<Copy SourceFiles="$(PublishDir)/runtimes/any/native/default.win32manifest;
|
<Copy SourceFiles="$(PublishDir)/$(TargetName).runtimeconfig.json;
|
||||||
$(PublishDir)/runtimes/any/native/Microsoft.FSharp.Targets;
|
|
||||||
$(PublishDir)/runtimes/any/native/Microsoft.Portable.FSharp.Targets;
|
|
||||||
$(PublishDir)/runtimes/any/native/Microsoft.FSharp.NetSdk.props;
|
|
||||||
$(PublishDir)/runtimes/any/native/Microsoft.FSharp.NetSdk.targets;
|
|
||||||
$(PublishDir)/runtimes/any/native/FSharp.Core.optdata;
|
|
||||||
$(PublishDir)/runtimes/any/native/FSharp.Core.sigdata;
|
|
||||||
$(PublishDir)/runtimes/any/native/FSharp.Core.xml;
|
|
||||||
$(PublishDir)/$(TargetName).runtimeconfig.json;
|
|
||||||
$(PublishDir)/$(TargetName).deps.json;"
|
$(PublishDir)/$(TargetName).deps.json;"
|
||||||
DestinationFiles="$(PublishDir)/default.win32manifest;
|
DestinationFiles="$(PublishDir)/fsc.runtimeconfig.json;
|
||||||
$(PublishDir)/Microsoft.FSharp.Targets;
|
|
||||||
$(PublishDir)/Microsoft.Portable.FSharp.Targets;
|
|
||||||
$(PublishDir)/Microsoft.FSharp.NetSdk.props;
|
|
||||||
$(PublishDir)/Microsoft.FSharp.NetSdk.targets;
|
|
||||||
$(PublishDir)/FSharp.Core.optdata;
|
|
||||||
$(PublishDir)/FSharp.Core.sigdata;
|
|
||||||
$(PublishDir)/FSharp.Core.xml;
|
|
||||||
$(PublishDir)/fsc.runtimeconfig.json;
|
|
||||||
$(PublishDir)/fsc.deps.json;"/>
|
$(PublishDir)/fsc.deps.json;"/>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
|
@ -23,12 +23,11 @@ namespace Microsoft.DotNet.New.Tests
|
||||||
[InlineData("C#", "web", false)]
|
[InlineData("C#", "web", false)]
|
||||||
[InlineData("C#", "mvc", false)]
|
[InlineData("C#", "mvc", false)]
|
||||||
[InlineData("C#", "webapi", false)]
|
[InlineData("C#", "webapi", false)]
|
||||||
// Uncomment the test below once https://github.com/dotnet/netcorecli-fsc/issues/92 is fixed.
|
[InlineData("F#", "console", false)]
|
||||||
//[InlineData("F#", "console", false)]
|
[InlineData("F#", "classlib", false)]
|
||||||
//[InlineData("F#", "classlib", false)]
|
[InlineData("F#", "mstest", false)]
|
||||||
//[InlineData("F#", "mstest", false)]
|
[InlineData("F#", "xunit", false)]
|
||||||
//[InlineData("F#", "xunit", false)]
|
[InlineData("F#", "mvc", true)]
|
||||||
//[InlineData("F#", "mvc", true)]
|
|
||||||
public void TemplateRestoresAndBuildsWithoutWarnings(
|
public void TemplateRestoresAndBuildsWithoutWarnings(
|
||||||
string language,
|
string language,
|
||||||
string projectType,
|
string projectType,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue