Refactor props in crossgen.target
This commit is contained in:
Justin Goshi
parent
921c116c65
commit
2eb2c00b30
5 changed files with 135 additions and 145 deletions
|
|
@ -51,6 +51,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
|
||||||
build\Stage0.props = build\Stage0.props
|
build\Stage0.props = build\Stage0.props
|
||||||
build\tasks = build\tasks
|
build\tasks = build\tasks
|
||||||
build\Test.targets = build\Test.targets
|
build\Test.targets = build\Test.targets
|
||||||
|
build\ToolInfo.props = build\ToolInfo.props
|
||||||
build\Version.props = build\Version.props
|
build\Version.props = build\Version.props
|
||||||
build\VersionBadge.props = build\VersionBadge.props
|
build\VersionBadge.props = build\VersionBadge.props
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
|
|
@ -89,11 +90,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
build\crossgen\Crossgen.targets = build\crossgen\Crossgen.targets
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}"
|
||||||
ProjectSection(SolutionItems) = preProject
|
ProjectSection(SolutionItems) = preProject
|
||||||
build\prepare\CentosCoreclrAndCoreFxDependencies.props = build\prepare\CentosCoreclrAndCoreFxDependencies.props
|
build\prepare\CentosCoreclrAndCoreFxDependencies.props = build\prepare\CentosCoreclrAndCoreFxDependencies.props
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?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/LzmaArchive.targets" />
|
<Import Project="compile/LzmaArchive.targets" />
|
||||||
<Import Project="crossgen/Crossgen.targets" />
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
|
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
|
||||||
|
|
@ -16,27 +15,26 @@
|
||||||
BuildProjectsForNuGetPackages;
|
BuildProjectsForNuGetPackages;
|
||||||
GetNuGetPackagesArchive;" />
|
GetNuGetPackagesArchive;" />
|
||||||
|
|
||||||
<Target Name="CompileCLI"
|
<Target Name="CompileCLI">
|
||||||
DependsOnTargets="InitCrossgenProps;">
|
<ItemGroup>
|
||||||
<ItemGroup>
|
<SharedFramework Remove="*" />
|
||||||
<SharedFramework Remove="*" />
|
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
|
||||||
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
|
|
||||||
|
|
||||||
<RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
|
<RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
|
||||||
<RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
|
<RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
|
||||||
|
|
||||||
<RuntimeAssetsToRemoveFromDeps Remove="*" />
|
|
||||||
<RuntimeAssetsToRemoveFromDeps Include="redist" />
|
|
||||||
<RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
|
|
||||||
<RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<RemoveDir Directories="$(StageDirectory)" />
|
<RuntimeAssetsToRemoveFromDeps Remove="*" />
|
||||||
<MakeDir Directories="$(StageDirectory)"/>
|
<RuntimeAssetsToRemoveFromDeps Include="redist" />
|
||||||
|
<RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
|
||||||
|
<RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- CopySharedFramework -->
|
<RemoveDir Directories="$(StageDirectory)" />
|
||||||
<Copy SourceFiles="@(SharedFramework)"
|
<MakeDir Directories="$(StageDirectory)"/>
|
||||||
DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
|
||||||
|
<!-- CopySharedFramework -->
|
||||||
|
<Copy SourceFiles="@(SharedFramework)"
|
||||||
|
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>
|
||||||
|
|
@ -47,7 +45,7 @@
|
||||||
</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="$(Stage0Directory)"
|
<DotNetPublish ToolPath="$(Stage0Directory)"
|
||||||
Output="$(SdkOutputDirectory)"
|
Output="$(SdkOutputDirectory)"
|
||||||
|
|
@ -63,152 +61,152 @@
|
||||||
VersionSuffix="$(CommitCount)"
|
VersionSuffix="$(CommitCount)"
|
||||||
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
|
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
|
||||||
|
|
||||||
<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;
|
||||||
$(SdkOutputDirectory)/System.Private.DataContractSerialization.dll" />
|
$(SdkOutputDirectory)/System.Private.DataContractSerialization.dll" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Move these "1.0" assemblies that TestPlatform lays down out of the way so crossgen doesn't pick them up.
|
<!-- 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 -->
|
We need https://github.com/dotnet/cli/issues/5464 fixed, so test platform is in a separate directory -->
|
||||||
<Move SourceFiles="@(NETCore10Assemblies)"
|
<Move SourceFiles="@(NETCore10Assemblies)"
|
||||||
DestinationFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')" />
|
DestinationFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')" />
|
||||||
|
|
||||||
<!-- Crossgen the CLI -->
|
<!-- Crossgen the CLI -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<SdkFiles Remove="*" />
|
<SdkFiles Remove="*" />
|
||||||
|
|
||||||
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
|
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
|
||||||
<SdkFilesExclude Include="$(SdkOutputDirectory)/TestHost*/**/*" />
|
<SdkFilesExclude Include="$(SdkOutputDirectory)/TestHost*/**/*" />
|
||||||
<SdkFiles Include="$(SdkOutputDirectory)/**/*" Exclude="@(SdkFilesExclude)" />
|
<SdkFiles Include="$(SdkOutputDirectory)/**/*" Exclude="@(SdkFilesExclude)" />
|
||||||
<SdkFilesWithPEMarker Remove="*" />
|
<SdkFilesWithPEMarker Remove="*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<AddMetadataIsPE Items="@(SdkFiles)">
|
<AddMetadataIsPE Items="@(SdkFiles)">
|
||||||
<Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
|
<Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
|
||||||
</AddMetadataIsPE>
|
</AddMetadataIsPE>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CrossgenTargets Remove="*" />
|
<CrossgenTargets Remove="*" />
|
||||||
<CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
|
<CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
|
||||||
|
|
||||||
<CompileStageSdkDirectories Remove="*" />
|
<CompileStageSdkDirectories Remove="*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
|
<RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
|
||||||
<Output TaskParameter="Filtered" ItemName="CompileStageSdkDirectories" />
|
<Output TaskParameter="Filtered" ItemName="CompileStageSdkDirectories" />
|
||||||
</RemoveDuplicates>
|
</RemoveDuplicates>
|
||||||
|
|
||||||
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
||||||
<Chmod Condition=" '$(OSName)' != 'win' And '$(DISABLE_CROSSGEN)' != '1' "
|
<Chmod Condition=" '$(OSName)' != 'win' And '$(DISABLE_CROSSGEN)' != '1' "
|
||||||
File="$(CrossgenPath)"
|
File="$(CrossgenPath)"
|
||||||
Mode="u+x" />
|
Mode="u+x" />
|
||||||
|
|
||||||
<Crossgen Condition=" '$(DISABLE_CROSSGEN)' != '1' "
|
<Crossgen Condition=" '$(DISABLE_CROSSGEN)' != '1' "
|
||||||
SourceAssembly="%(CrossgenTargets.FullPath)"
|
SourceAssembly="%(CrossgenTargets.FullPath)"
|
||||||
DestinationPath="%(CrossgenTargets.FullPath)"
|
DestinationPath="%(CrossgenTargets.FullPath)"
|
||||||
JITPath="$(LibCLRJitPath)"
|
JITPath="$(LibCLRJitPath)"
|
||||||
CrossgenPath="$(CrossgenPath)"
|
CrossgenPath="$(CrossgenPath)"
|
||||||
ReadyToRun="True"
|
ReadyToRun="True"
|
||||||
PlatformAssemblyPaths="@(PlatformAssemblies);
|
PlatformAssemblyPaths="@(PlatformAssemblies);
|
||||||
@(CompileStageSdkDirectories);
|
@(CompileStageSdkDirectories);
|
||||||
$(SharedFrameworkNameVersionPath)" />
|
$(SharedFrameworkNameVersionPath)" />
|
||||||
|
|
||||||
<!-- 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)" />
|
||||||
|
|
||||||
<!-- Move the "1.0" assemblies back -->
|
<!-- Move the "1.0" assemblies back -->
|
||||||
<Move SourceFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')"
|
<Move SourceFiles="@(NETCore10Assemblies->'$(SdkOutputDirectory)/%(Filename)%(Extension).bak')"
|
||||||
DestinationFiles="@(NETCore10Assemblies)" />
|
DestinationFiles="@(NETCore10Assemblies)" />
|
||||||
|
|
||||||
<!-- Generate .version file -->
|
<!-- Generate .version file -->
|
||||||
<WriteLinesToFile File="$(SdkOutputDirectory)/.version"
|
<WriteLinesToFile File="$(SdkOutputDirectory)/.version"
|
||||||
Lines="$(CommitHash);$(SdkVersion);$(Rid)"
|
Lines="$(CommitHash);$(SdkVersion);$(Rid)"
|
||||||
Overwrite="true" />
|
Overwrite="true" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.targets" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.targets" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.Targets" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.Targets" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.props" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.props" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.overridetasks" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.overridetasks" />
|
||||||
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.tasks" />
|
<MSBuildTargetsToCopy Include="$(MSBuildTargetsDirectory)/**/*.tasks" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
|
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
|
||||||
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
|
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Delete Files="@(FilesToClean)" />
|
<Delete Files="@(FilesToClean)" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<FilesToCopy Include="$(StageDirectory)/**/*" />
|
<FilesToCopy Include="$(StageDirectory)/**/*" />
|
||||||
<PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
|
<PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Copy SourceFiles="@(FilesToCopy)"
|
<Copy SourceFiles="@(FilesToCopy)"
|
||||||
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
|
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
|
|
||||||
<Delete Files="@(PdbsToClean)" />
|
<Delete Files="@(PdbsToClean)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PublishSdks"
|
<Target Name="PublishSdks"
|
||||||
|
|
|
||||||
7
build/ToolInfo.props
Normal file
7
build/ToolInfo.props
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
|
||||||
|
<CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
|
||||||
|
<LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Target Name="InitCrossgenProps"
|
|
||||||
DependsOnTargets="Init">
|
|
||||||
<PropertyGroup>
|
|
||||||
<RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
|
|
||||||
|
|
||||||
<CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
|
|
||||||
<LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Target>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
<Import Project="build/OutputDirectories.props" />
|
<Import Project="build/OutputDirectories.props" />
|
||||||
<Import Project="build/BuildDefaults.props" />
|
<Import Project="build/BuildDefaults.props" />
|
||||||
<Import Project="build/BuildOutputs.props" />
|
<Import Project="build/BuildOutputs.props" />
|
||||||
|
<Import Project="build/ToolInfo.props" />
|
||||||
<Import Project="build/Stage0.props" />
|
<Import Project="build/Stage0.props" />
|
||||||
<Import Project="build/VersionBadge.props" />
|
<Import Project="build/VersionBadge.props" />
|
||||||
<Import Project="build/Microsoft.DotNet.Cli.BundledRuntimes.props" />
|
<Import Project="build/Microsoft.DotNet.Cli.BundledRuntimes.props" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue