8408322652
* release/2.1.1xx: (45 commits) Adding the VBCSCompiler to the list of signed files due to crossgen. Remove obsolete F# satellite package MSBuild 15.6.76 Update F# to match dev15.6 preview 4 Excluding shared framework assemblies from the Roslyn folder in the SDK. Insert NuGet Build 4.6.0-rtm-4880 into cli Updating Roslyn to 2.7.0-beta3-62529-05. Update fsharp compiler to match preview 4 Insert NuGet Build 4.6.0-rtm-4862 into cli MSBuild 15.6.70 Insert NuGet Build 4.6.0-rtm-4859 into cli MSBuild 15.6.69 Update package reference update fsharp compiler to match vs2017.6 preview 3 Insert NuGet Build 4.6.0-rtm-4825 into cli Fixing the prefercliruntime asset Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release. MSBuild 15.6.54 Updates the TestPlatform to 15.6.0-preview-20180109-01 ... Conflicts: build/BranchInfo.props build/Branding.props build/DependencyVersions.props build/NugetConfigFile.targets build/Version.props build/package/Installer.DEB.proj build/package/Installer.DEB.targets build/package/Installer.RPM.targets build_projects/dotnet-cli-build/dotnet-cli-build.csproj packaging/osx/clisdk/resources/cs.lproj/conclusion.html packaging/osx/clisdk/resources/de.lproj/conclusion.html packaging/osx/clisdk/resources/en.lproj/conclusion.html packaging/osx/clisdk/resources/es.lproj/conclusion.html packaging/osx/clisdk/resources/fr.lproj/conclusion.html packaging/osx/clisdk/resources/it.lproj/conclusion.html packaging/osx/clisdk/resources/ja.lproj/conclusion.html packaging/osx/clisdk/resources/ko.lproj/conclusion.html packaging/osx/clisdk/resources/pl.lproj/conclusion.html packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html packaging/osx/clisdk/resources/ru.lproj/conclusion.html packaging/osx/clisdk/resources/tr.lproj/conclusion.html packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html packaging/windows/clisdk/bundle.wxl scripts/obtain/dotnet-install.ps1 scripts/obtain/dotnet-install.sh src/tool_fsharp/tool_fsc.csproj test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
56 lines
2.6 KiB
XML
56 lines
2.6 KiB
XML
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
|
|
|
|
<PropertyGroup>
|
|
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
|
<TargetFramework>$(CliTargetFramework)</TargetFramework>
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
|
<PublishDir>$(FSharpDirectory)</PublishDir>
|
|
<VersionSuffix>$(CommitCount)</VersionSuffix>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup>
|
|
<PackageReference Include="Microsoft.NetCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
|
|
<PackageReference Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
|
|
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Content Include="RunFsc.sh;RunFsc.cmd">
|
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
|
</Content>
|
|
</ItemGroup>
|
|
|
|
<Target Name="MakeFscRunnableAndMoveToPublishDir"
|
|
AfterTargets="Publish"
|
|
BeforeTargets="RemoveFilesAfterPublish">
|
|
|
|
<ItemGroup>
|
|
<AssetsToRemoveFromDeps Include="tool_fsc.dll"
|
|
SectionName="runtime"/>
|
|
</ItemGroup>
|
|
|
|
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
|
|
SectionName="%(AssetsToRemoveFromDeps.SectionName)"
|
|
AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
|
|
|
|
<!-- Deploy deps and runtime config for fsc.exe and fsi.exe. Both apps have exactly the same dependencies so this is Ok -->
|
|
<Copy SourceFiles="$(PublishDir)/$(TargetName).runtimeconfig.json;
|
|
$(PublishDir)/$(TargetName).deps.json;"
|
|
DestinationFiles="$(PublishDir)/fsc.runtimeconfig.json;
|
|
$(PublishDir)/fsc.deps.json;"/>
|
|
<Copy SourceFiles="$(PublishDir)/$(TargetName).runtimeconfig.json;
|
|
$(PublishDir)/$(TargetName).deps.json;"
|
|
DestinationFiles="$(PublishDir)/fsi.runtimeconfig.json;
|
|
$(PublishDir)/fsi.deps.json;"/>
|
|
</Target>
|
|
|
|
<Target Name="RemoveFilesAfterPublish"
|
|
AfterTargets="Publish">
|
|
<Delete Files="$(PublishDir)/$(TargetName).dll" />
|
|
<Delete Files="$(PublishDir)/$(TargetName).pdb" />
|
|
<Delete Files="$(PublishDir)/$(TargetName).runtimeconfig.json" />
|
|
<Delete Files="$(PublishDir)/$(TargetName).deps.json" />
|
|
</Target>
|
|
</Project>
|