Merge master into local branch.
This commit is contained in:
Eric Erhardt
commit
208776ed69
2 changed files with 322 additions and 321 deletions
|
|
@ -1,319 +1,320 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="compile/Microsoft.DotNet.Cli.LzmaArchive.targets" />
|
<Import Project="compile/Microsoft.DotNet.Cli.LzmaArchive.targets" />
|
||||||
<Import Project="crossgen/Microsoft.DotNet.Cli.Crossgen.targets" />
|
<Import Project="crossgen/Microsoft.DotNet.Cli.Crossgen.targets" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
|
<BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
|
||||||
<MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
|
<MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
|
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
|
||||||
<BundledTools Include="MSBuild;NuGet.CommandLine.XPlat;dotnet" />
|
<BundledTools Include="MSBuild;NuGet.CommandLine.XPlat;dotnet" />
|
||||||
<MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" />
|
<MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Target Name="Compile" DependsOnTargets="Prepare;
|
<Target Name="Compile" DependsOnTargets="Prepare;
|
||||||
SetupStage;
|
SetupStage;
|
||||||
CompileStage;
|
CompileStage;
|
||||||
PublishSdks;
|
PublishSdks;
|
||||||
PublishTemplates;
|
PublishTemplates;
|
||||||
BuildProjectsForNuGetPackages;
|
BuildProjectsForNuGetPackages;
|
||||||
GetNuGetPackagesArchive;" />
|
GetNuGetPackagesArchive;" />
|
||||||
|
|
||||||
<Target Name="SetupStage"
|
<Target Name="SetupStage"
|
||||||
DependsOnTargets="Prepare">
|
DependsOnTargets="Prepare">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SrcDirectory>$(RepoRoot)/src</SrcDirectory>
|
<SrcDirectory>$(RepoRoot)/src</SrcDirectory>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CompileStageInputs Include="$(SrcDirectory)/**/*.cs" Exclude="$(SrcDirectory)/**/obj/**/*.cs" />
|
<CompileStageInputs Include="$(SrcDirectory)/**/*.cs" Exclude="$(SrcDirectory)/**/obj/**/*.cs" />
|
||||||
<CompileStageInputs Include="$(SrcDirectory)/**/*.csproj;$(SrcDirectory)/**/project.assets.json" />
|
<CompileStageInputs Include="$(SrcDirectory)/**/*.csproj;$(SrcDirectory)/**/project.assets.json" />
|
||||||
|
|
||||||
<Stage Include="Stage1">
|
<Stage Include="Stage1">
|
||||||
<Inputs>@(CompileStageInputs)</Inputs>
|
<Inputs>@(CompileStageInputs)</Inputs>
|
||||||
<StageDirectory>$(Stage1Directory)</StageDirectory>
|
<StageDirectory>$(Stage1Directory)</StageDirectory>
|
||||||
<StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
|
<StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
|
||||||
<DotnetDir>$(Stage0Directory)</DotnetDir>
|
<DotnetDir>$(Stage0Directory)</DotnetDir>
|
||||||
</Stage>
|
</Stage>
|
||||||
<Stage Include="Stage2">
|
<Stage Include="Stage2">
|
||||||
<Inputs>@(CompileStageInputs)</Inputs>
|
<Inputs>@(CompileStageInputs)</Inputs>
|
||||||
<StageDirectory>$(Stage2Directory)</StageDirectory>
|
<StageDirectory>$(Stage2Directory)</StageDirectory>
|
||||||
<StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
|
<StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
|
||||||
<DotnetDir>$(Stage0Directory)</DotnetDir>
|
<DotnetDir>$(Stage0Directory)</DotnetDir>
|
||||||
</Stage>
|
</Stage>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="CompileStage"
|
<Target Name="CompileStage"
|
||||||
DependsOnTargets="SetupStage;
|
DependsOnTargets="SetupStage;
|
||||||
InitCrossgenProps;"
|
InitCrossgenProps;"
|
||||||
Inputs="%(Stage.Inputs)"
|
Inputs="%(Stage.Inputs)"
|
||||||
Outputs="%(StageDirectory)/sdk/$(SdkVersion)/dotnet.dll">
|
Outputs="%(StageDirectory)/sdk/$(SdkVersion)/dotnet.dll">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
|
<DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
|
||||||
<DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
|
<DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
|
||||||
|
|
||||||
<DynamicLibSuffix Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibSuffix>
|
<DynamicLibSuffix Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibSuffix>
|
||||||
<DynamicLibSuffix Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibSuffix>
|
<DynamicLibSuffix Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibSuffix>
|
||||||
<DynamicLibSuffix Condition=" '$(DynamicLibSuffix)' == '' ">.so</DynamicLibSuffix>
|
<DynamicLibSuffix Condition=" '$(DynamicLibSuffix)' == '' ">.so</DynamicLibSuffix>
|
||||||
|
|
||||||
<DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
|
<DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
|
||||||
<DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
|
<DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
|
||||||
<HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
|
<HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
|
||||||
|
|
||||||
<StageDirectory>%(Stage.StageDirectory)</StageDirectory>
|
<StageDirectory>%(Stage.StageDirectory)</StageDirectory>
|
||||||
<StageSymbolsDirectory>%(Stage.StageSymbolsDirectory)</StageSymbolsDirectory>
|
<StageSymbolsDirectory>%(Stage.StageSymbolsDirectory)</StageSymbolsDirectory>
|
||||||
<SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
|
<SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
|
||||||
<BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
|
<BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
|
||||||
<MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
|
<MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
|
||||||
|
|
||||||
<SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
|
<SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BinObj Remove="*" />
|
<BinObj Remove="*" />
|
||||||
<BinObj Include="$(SrcDirectory)/**/bin/**/*" />
|
<BinObj Include="$(SrcDirectory)/**/bin/**/*" />
|
||||||
<BinObj Include="$(SrcDirectory)/**/obj/**/*" Exclude="$(SrcDirectory)/**/obj/project.assets.json;$(SrcDirectory)/**/obj/*.csproj.nuget.g.props;$(SrcDirectory)/**/obj/*.csproj.nuget.g.targets" />
|
<BinObj Include="$(SrcDirectory)/**/obj/**/*" Exclude="$(SrcDirectory)/**/obj/project.assets.json;$(SrcDirectory)/**/obj/*.csproj.nuget.g.props;$(SrcDirectory)/**/obj/*.csproj.nuget.g.targets" />
|
||||||
|
|
||||||
<SharedFramework Remove="*" />
|
<SharedFramework Remove="*" />
|
||||||
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
|
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
|
||||||
|
|
||||||
<RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
|
<RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
|
||||||
<RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
|
<RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
|
||||||
|
|
||||||
<RuntimeAssetsToRemoveFromDeps Remove="*" />
|
<RuntimeAssetsToRemoveFromDeps Remove="*" />
|
||||||
<RuntimeAssetsToRemoveFromDeps Include="redist" />
|
<RuntimeAssetsToRemoveFromDeps Include="redist" />
|
||||||
<RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
|
<RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
|
||||||
<RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
|
<RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Delete Files="@(BinObj)" />
|
<Delete Files="@(BinObj)" />
|
||||||
|
|
||||||
<RemoveDir Directories="$(StageDirectory)" />
|
<RemoveDir Directories="$(StageDirectory)" />
|
||||||
<MakeDir Directories="$(StageDirectory)"/>
|
<MakeDir Directories="$(StageDirectory)"/>
|
||||||
|
|
||||||
<!-- CopySharedFramework -->
|
<!-- CopySharedFramework -->
|
||||||
<Copy SourceFiles="@(SharedFramework)"
|
<Copy SourceFiles="@(SharedFramework)"
|
||||||
DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
|
|
||||||
<!-- Workaround for https://github.com/dotnet/sdk/issues/115 -->
|
<!-- Workaround for https://github.com/dotnet/sdk/issues/115 -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<HackFilesToCopy Include="$(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.0\**;
|
<HackFilesToCopy Include="$(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.0\**;
|
||||||
$(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.1\**;
|
$(NuGetPackagesDir)\microsoft.build.runtime\$(CLI_MSBuild_Version)\contentFiles\any\netcoreapp1.1\**;
|
||||||
$(NuGetPackagesDir)\microsoft.codeanalysis.build.tasks\$(CLI_Roslyn_Version)\contentFiles\any\any\**;
|
$(NuGetPackagesDir)\microsoft.codeanalysis.build.tasks\$(CLI_Roslyn_Version)\contentFiles\any\any\**;
|
||||||
$(NuGetPackagesDir)\microsoft.testplatform.cli\$(CLI_TestPlatform_Version)\contentFiles\any\any\**" />
|
$(NuGetPackagesDir)\microsoft.testplatform.cli\$(CLI_TestPlatform_Version)\contentFiles\any\any\**" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Copy SourceFiles="@(HackFilesToCopy)"
|
<Copy SourceFiles="@(HackFilesToCopy)"
|
||||||
DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
|
|
||||||
<!-- Publish DotNet -->
|
<!-- Publish DotNet -->
|
||||||
<DotNetPublish ToolPath="%(Stage.DotnetDir)"
|
<DotNetPublish ToolPath="%(Stage.DotnetDir)"
|
||||||
Output="$(SdkOutputDirectory)"
|
Output="$(SdkOutputDirectory)"
|
||||||
Configuration="$(Configuration)"
|
Configuration="$(Configuration)"
|
||||||
VersionSuffix="$(CommitCount)"
|
VersionSuffix="$(CommitCount)"
|
||||||
ProjectPath="$(SrcDirectory)/redist/redist.csproj"
|
ProjectPath="$(SrcDirectory)/redist/redist.csproj"
|
||||||
MSBuildArgs="/p:GenerateRuntimeConfigurationFiles=true" />
|
MSBuildArgs="/p:GenerateRuntimeConfigurationFiles=true" />
|
||||||
|
|
||||||
<!-- Publish DotNet -->
|
<!-- Publish DotNet -->
|
||||||
<DotNetPublish ToolPath="%(Stage.DotnetDir)"
|
<DotNetPublish ToolPath="%(Stage.DotnetDir)"
|
||||||
Output="$(SdkOutputDirectory)/Roslyn"
|
Output="$(SdkOutputDirectory)/Roslyn"
|
||||||
Configuration="$(Configuration)"
|
Configuration="$(Configuration)"
|
||||||
VersionSuffix="$(CommitCount)"
|
VersionSuffix="$(CommitCount)"
|
||||||
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
|
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
|
||||||
|
|
||||||
<!-- Corehostify Binaries -->
|
<!-- Corehostify Binaries -->
|
||||||
<ItemGroup Condition=" '$(OSName)' != 'win' ">
|
<ItemGroup Condition=" '$(OSName)' != 'win' ">
|
||||||
<SdkOutputChmodTargets Remove="*" />
|
<SdkOutputChmodTargets Remove="*" />
|
||||||
<SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.exe;
|
<SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.exe;
|
||||||
$(SdkOutputDirectory)/**/*.dll" >
|
$(SdkOutputDirectory)/**/*.dll" >
|
||||||
<!-- Managed assemblies do not need execute -->
|
<!-- Managed assemblies do not need execute -->
|
||||||
<Mode>u=rw,g=r,o=r</Mode>
|
<Mode>u=rw,g=r,o=r</Mode>
|
||||||
</SdkOutputChmodTargets>
|
</SdkOutputChmodTargets>
|
||||||
|
|
||||||
<SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.dylib;
|
<SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.dylib;
|
||||||
$(SdkOutputDirectory)/**/*.so" >
|
$(SdkOutputDirectory)/**/*.so" >
|
||||||
<!-- Generally, dylibs and sos have 'x' -->
|
<!-- Generally, dylibs and sos have 'x' -->
|
||||||
<Mode>u=rwx,g=rx,o=rx</Mode>
|
<Mode>u=rwx,g=rx,o=rx</Mode>
|
||||||
</SdkOutputChmodTargets>
|
</SdkOutputChmodTargets>
|
||||||
|
|
||||||
<SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*"
|
<SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*"
|
||||||
Exclude="$(SdkOutputDirectory)/**/*.*" >
|
Exclude="$(SdkOutputDirectory)/**/*.*" >
|
||||||
<!-- Executables need x -->
|
<!-- Executables need x -->
|
||||||
<Mode>u=rwx,g=rx,o=rx</Mode>
|
<Mode>u=rwx,g=rx,o=rx</Mode>
|
||||||
</SdkOutputChmodTargets>
|
</SdkOutputChmodTargets>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Chmod Condition=" '$(OSName)' != 'win' "
|
<Chmod Condition=" '$(OSName)' != 'win' "
|
||||||
File="%(SdkOutputChModTargets.FullPath)"
|
File="%(SdkOutputChModTargets.FullPath)"
|
||||||
Mode="%(SdkOutputChModTargets.Mode)" />
|
Mode="%(SdkOutputChModTargets.Mode)" />
|
||||||
|
|
||||||
<RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
|
<RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
|
||||||
SectionName="runtimeTargets"
|
SectionName="runtimeTargets"
|
||||||
AssetPath="$(BinaryToCorehostifyRelDir)/%(RuntimeTargetsAssetsToRemoveFromDeps.Identity).exe" />
|
AssetPath="$(BinaryToCorehostifyRelDir)/%(RuntimeTargetsAssetsToRemoveFromDeps.Identity).exe" />
|
||||||
|
|
||||||
<RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
|
<RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
|
||||||
SectionName="runtime"
|
SectionName="runtime"
|
||||||
AssetPath="%(RuntimeAssetsToRemoveFromDeps.Identity).dll" />
|
AssetPath="%(RuntimeAssetsToRemoveFromDeps.Identity).dll" />
|
||||||
|
|
||||||
<Copy SourceFiles="$(SdkOutputDirectory)/redist.deps.json"
|
<Copy SourceFiles="$(SdkOutputDirectory)/redist.deps.json"
|
||||||
DestinationFiles="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json" />
|
DestinationFiles="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json" />
|
||||||
|
|
||||||
<Copy SourceFiles="$(SdkOutputDirectory)/redist.runtimeconfig.json"
|
<Copy SourceFiles="$(SdkOutputDirectory)/redist.runtimeconfig.json"
|
||||||
DestinationFiles="$(SdkOutputDirectory)/%(BundledTools.Identity).runtimeconfig.json" />
|
DestinationFiles="$(SdkOutputDirectory)/%(BundledTools.Identity).runtimeconfig.json" />
|
||||||
|
|
||||||
<ChangeEntryPointLibraryName
|
<ChangeEntryPointLibraryName
|
||||||
DepsFile="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json"
|
DepsFile="$(SdkOutputDirectory)/%(BundledTools.Identity).deps.json"
|
||||||
NewName="%(BundledTools.Identity).deps.json" />
|
NewName="%(BundledTools.Identity).deps.json" />
|
||||||
|
|
||||||
<!-- cleanup project output we don't need -->
|
<!-- cleanup project output we don't need -->
|
||||||
<Delete Files="$(SdkOutputDirectory)/redist%(PublishOutputExtensions.Identity)" />
|
<Delete Files="$(SdkOutputDirectory)/redist%(PublishOutputExtensions.Identity)" />
|
||||||
<Delete Files="$(SdkOutputDirectory)/tool_msbuild%(PublishOutputExtensions.Identity)" />
|
<Delete Files="$(SdkOutputDirectory)/tool_msbuild%(PublishOutputExtensions.Identity)" />
|
||||||
<Delete Files="$(SdkOutputDirectory)/tool_nuget%(PublishOutputExtensions.Identity)" />
|
<Delete Files="$(SdkOutputDirectory)/tool_nuget%(PublishOutputExtensions.Identity)" />
|
||||||
|
|
||||||
<!-- Copy Host to SDK Directory -->
|
<!-- Copy Host to SDK Directory -->
|
||||||
<Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostBaseName)"
|
<Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostBaseName)"
|
||||||
DestinationFiles="$(SdkOutputDirectory)/corehost$(ExeExtension)" />
|
DestinationFiles="$(SdkOutputDirectory)/corehost$(ExeExtension)" />
|
||||||
|
|
||||||
<Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostFxrBaseName)"
|
<Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostFxrBaseName)"
|
||||||
DestinationFiles="$(SdkOutputDirectory)/$(DotnetHostFxrBaseName)" />
|
DestinationFiles="$(SdkOutputDirectory)/$(DotnetHostFxrBaseName)" />
|
||||||
|
|
||||||
<Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(HostPolicyBaseName)"
|
<Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(HostPolicyBaseName)"
|
||||||
DestinationFiles="$(SdkOutputDirectory)/$(HostPolicyBaseName)" />
|
DestinationFiles="$(SdkOutputDirectory)/$(HostPolicyBaseName)" />
|
||||||
|
|
||||||
<!-- copy core sdk -->
|
<!-- copy core sdk -->
|
||||||
<Copy SourceFiles="@(MSBuildImportsContent)"
|
<Copy SourceFiles="@(MSBuildImportsContent)"
|
||||||
DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" />
|
DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<NETCore10Assemblies Include="$(SdkOutputDirectory)/System.ComponentModel.Primitives.dll;
|
<NETCore10Assemblies Include="$(SdkOutputDirectory)/System.ComponentModel.Primitives.dll;
|
||||||
$(SdkOutputDirectory)/System.Collections.Specialized.dll;
|
$(SdkOutputDirectory)/System.Collections.Specialized.dll;
|
||||||
$(SdkOutputDirectory)/System.Collections.NonGeneric.dll" />
|
$(SdkOutputDirectory)/System.Collections.NonGeneric.dll;
|
||||||
</ItemGroup>
|
$(SdkOutputDirectory)/System.Private.DataContractSerialization.dll" />
|
||||||
|
</ItemGroup>
|
||||||
<!-- Move these "1.0" assemblies that TestPlatform lays down out of the way so crossgen doesn't pick them up.
|
|
||||||
We need https://github.com/dotnet/cli/issues/5464 fixed, so test platform is in a separate directory -->
|
<!-- Move these "1.0" assemblies that TestPlatform lays down out of the way so crossgen doesn't pick them up.
|
||||||
<Move SourceFiles="@(NETCore10Assemblies)"
|
We need https://github.com/dotnet/cli/issues/5464 fixed, so test platform is in a separate directory -->
|
||||||
DestinationFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')" />
|
<Move SourceFiles="@(NETCore10Assemblies)"
|
||||||
|
DestinationFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')" />
|
||||||
<!-- Crossgen the CLI -->
|
|
||||||
<ItemGroup>
|
<!-- Crossgen the CLI -->
|
||||||
<SdkFiles Remove="*" />
|
<ItemGroup>
|
||||||
|
<SdkFiles Remove="*" />
|
||||||
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
|
|
||||||
<SdkFilesExclude Include="$(SdkOutputDirectory)/TestHost*/**/*" />
|
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
|
||||||
<!-- Remove NuGet.LibraryModel due to https://github.com/dotnet/coreclr/issues/9118 -->
|
<SdkFilesExclude Include="$(SdkOutputDirectory)/TestHost*/**/*" />
|
||||||
<SdkFilesExclude Include="$(SdkOutputDirectory)/NuGet.LibraryModel.dll" />
|
<!-- Remove NuGet.LibraryModel due to https://github.com/dotnet/coreclr/issues/9118 -->
|
||||||
<SdkFiles Include="$(SdkOutputDirectory)/**/*" Exclude="@(SdkFilesExclude)" />
|
<SdkFilesExclude Include="$(SdkOutputDirectory)/NuGet.LibraryModel.dll" />
|
||||||
<SdkFilesWithPEMarker Remove="*" />
|
<SdkFiles Include="$(SdkOutputDirectory)/**/*" Exclude="@(SdkFilesExclude)" />
|
||||||
</ItemGroup>
|
<SdkFilesWithPEMarker Remove="*" />
|
||||||
|
</ItemGroup>
|
||||||
<AddMetadataIsPE Items="@(SdkFiles)">
|
|
||||||
<Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
|
<AddMetadataIsPE Items="@(SdkFiles)">
|
||||||
</AddMetadataIsPE>
|
<Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
|
||||||
|
</AddMetadataIsPE>
|
||||||
<ItemGroup>
|
|
||||||
<CrossgenTargets Remove="*" />
|
<ItemGroup>
|
||||||
<CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
|
<CrossgenTargets Remove="*" />
|
||||||
|
<CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
|
||||||
<CompileStageSdkDirectories Remove="*" />
|
|
||||||
</ItemGroup>
|
<CompileStageSdkDirectories Remove="*" />
|
||||||
|
</ItemGroup>
|
||||||
<RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
|
|
||||||
<Output TaskParameter="Filtered" ItemName="CompileStageSdkDirectories" />
|
<RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
|
||||||
</RemoveDuplicates>
|
<Output TaskParameter="Filtered" ItemName="CompileStageSdkDirectories" />
|
||||||
|
</RemoveDuplicates>
|
||||||
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
|
||||||
<Chmod Condition=" '$(OSName)' != 'win' "
|
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
||||||
File="$(CrossgenPath)"
|
<Chmod Condition=" '$(OSName)' != 'win' "
|
||||||
Mode="u+x" />
|
File="$(CrossgenPath)"
|
||||||
|
Mode="u+x" />
|
||||||
<Crossgen Condition=" '$(DISABLE_CROSSGEN)' != '1' "
|
|
||||||
SourceAssembly="%(CrossgenTargets.FullPath)"
|
<Crossgen Condition=" '$(DISABLE_CROSSGEN)' != '1' "
|
||||||
DestinationPath="%(CrossgenTargets.FullPath)"
|
SourceAssembly="%(CrossgenTargets.FullPath)"
|
||||||
JITPath="$(LibCLRJitPath)"
|
DestinationPath="%(CrossgenTargets.FullPath)"
|
||||||
CrossgenPath="$(CrossgenPath)"
|
JITPath="$(LibCLRJitPath)"
|
||||||
ReadyToRun="True"
|
CrossgenPath="$(CrossgenPath)"
|
||||||
PlatformAssemblyPaths="@(PlatformAssemblies);
|
ReadyToRun="True"
|
||||||
@(CompileStageSdkDirectories);
|
PlatformAssemblyPaths="@(PlatformAssemblies);
|
||||||
$(SharedFrameworkNameVersionPath)" />
|
@(CompileStageSdkDirectories);
|
||||||
|
$(SharedFrameworkNameVersionPath)" />
|
||||||
<!-- Move the "1.0" assemblies back -->
|
|
||||||
<Move SourceFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')"
|
<!-- Move the "1.0" assemblies back -->
|
||||||
DestinationFiles="@(NETCore10Assemblies)" />
|
<Move SourceFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')"
|
||||||
|
DestinationFiles="@(NETCore10Assemblies)" />
|
||||||
<!-- Generate .version file -->
|
|
||||||
<WriteLinesToFile File="$(SdkOutputDirectory)/.version"
|
<!-- Generate .version file -->
|
||||||
Lines="$(CommitHash);$(SdkVersion);$(Rid)"
|
<WriteLinesToFile File="$(SdkOutputDirectory)/.version"
|
||||||
Overwrite="true" />
|
Lines="$(CommitHash);$(SdkVersion);$(Rid)"
|
||||||
|
Overwrite="true" />
|
||||||
<ItemGroup>
|
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.targets" />
|
<ItemGroup>
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.Targets" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.targets" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.props" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.Targets" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.overridetasks" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.props" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.tasks" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.overridetasks" />
|
||||||
</ItemGroup>
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.tasks" />
|
||||||
|
</ItemGroup>
|
||||||
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
|
|
||||||
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
|
||||||
|
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
<ItemGroup>
|
|
||||||
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
|
<ItemGroup>
|
||||||
</ItemGroup>
|
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
|
||||||
|
</ItemGroup>
|
||||||
<Delete Files="@(FilesToClean)" />
|
|
||||||
|
<Delete Files="@(FilesToClean)" />
|
||||||
<ItemGroup>
|
|
||||||
<FilesToCopy Include="$(StageDirectory)/**/*" />
|
<ItemGroup>
|
||||||
<PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
|
<FilesToCopy Include="$(StageDirectory)/**/*" />
|
||||||
</ItemGroup>
|
<PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
|
||||||
|
</ItemGroup>
|
||||||
<Copy SourceFiles="@(FilesToCopy)"
|
|
||||||
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
|
<Copy SourceFiles="@(FilesToCopy)"
|
||||||
|
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
<Delete Files="@(PdbsToClean)" />
|
|
||||||
</Target>
|
<Delete Files="@(PdbsToClean)" />
|
||||||
|
</Target>
|
||||||
<Target Name="PublishSdks"
|
|
||||||
DependsOnTargets="Prepare">
|
<Target Name="PublishSdks"
|
||||||
<ItemGroup>
|
DependsOnTargets="Prepare">
|
||||||
<SdksToBundle Include="build/Microsoft.DotNet.Cli.BundledSdks.proj">
|
<ItemGroup>
|
||||||
<Properties>
|
<SdksToBundle Include="build/Microsoft.DotNet.Cli.BundledSdks.proj">
|
||||||
CLIBuildDll=$(CLIBuildDll);
|
<Properties>
|
||||||
NuGetPackagesDir=$(NuGetPackagesDir);
|
CLIBuildDll=$(CLIBuildDll);
|
||||||
SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
|
NuGetPackagesDir=$(NuGetPackagesDir);
|
||||||
SdkPackageName=%(BundledSdk.Identity);
|
SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
|
||||||
SdkPackageVersion=%(BundledSdk.Version);
|
SdkPackageName=%(BundledSdk.Identity);
|
||||||
Stage0Directory=$(Stage0Directory)
|
SdkPackageVersion=%(BundledSdk.Version);
|
||||||
</Properties>
|
Stage0Directory=$(Stage0Directory)
|
||||||
</SdksToBundle>
|
</Properties>
|
||||||
</ItemGroup>
|
</SdksToBundle>
|
||||||
|
</ItemGroup>
|
||||||
<MSBuild
|
|
||||||
BuildInParallel="False"
|
<MSBuild
|
||||||
Projects="@(SdksToBundle)">
|
BuildInParallel="False"
|
||||||
</MSBuild>
|
Projects="@(SdksToBundle)">
|
||||||
</Target>
|
</MSBuild>
|
||||||
|
</Target>
|
||||||
<Target Name="PublishTemplates"
|
|
||||||
DependsOnTargets="Prepare">
|
<Target Name="PublishTemplates"
|
||||||
<ItemGroup>
|
DependsOnTargets="Prepare">
|
||||||
<TemplatesToBundle Include="build/Microsoft.DotNet.Cli.BundledTemplates.proj">
|
<ItemGroup>
|
||||||
<Properties>
|
<TemplatesToBundle Include="build/Microsoft.DotNet.Cli.BundledTemplates.proj">
|
||||||
TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
|
<Properties>
|
||||||
TemplatePackageName=%(BundledTemplate.Identity);
|
TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
|
||||||
TemplatePackageVersion=%(BundledTemplate.Version);
|
TemplatePackageName=%(BundledTemplate.Identity);
|
||||||
Stage0Directory=$(Stage0Directory)
|
TemplatePackageVersion=%(BundledTemplate.Version);
|
||||||
</Properties>
|
Stage0Directory=$(Stage0Directory)
|
||||||
</TemplatesToBundle>
|
</Properties>
|
||||||
</ItemGroup>
|
</TemplatesToBundle>
|
||||||
|
</ItemGroup>
|
||||||
<MSBuild
|
|
||||||
BuildInParallel="False"
|
<MSBuild
|
||||||
Projects="@(TemplatesToBundle)">
|
BuildInParallel="False"
|
||||||
</MSBuild>
|
Projects="@(TemplatesToBundle)">
|
||||||
</Target>
|
</MSBuild>
|
||||||
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CLI_SharedFrameworkVersion>2.0.0-beta-001386-00</CLI_SharedFrameworkVersion>
|
<CLI_SharedFrameworkVersion>2.0.0-beta-001450-00</CLI_SharedFrameworkVersion>
|
||||||
<CLI_CoreCLRVersion>1.2.0-beta-24904-03</CLI_CoreCLRVersion>
|
<CLI_CoreCLRVersion>2.0.0-beta-24927-03</CLI_CoreCLRVersion>
|
||||||
<CLI_MSBuild_Version>15.1.0-preview-000539-01</CLI_MSBuild_Version>
|
<CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
|
||||||
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
|
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
|
||||||
<CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
|
<CLI_NETSDK_Version>1.0.0-alpha-20170125-1</CLI_NETSDK_Version>
|
||||||
<!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
|
<!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.0.0-rc3-netstandard2.0 to contain "2.0" TFMs -->
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue