diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj index aff8d01e180e01e336854121cbac179200939997..2b4d5e4b42b5de143e538bb61b8156e5402465b9 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj @@ -204,21 +204,19 @@ This package is an internal implementation of the .NET Core SDK and is not meant DependsOnTargets="_ResolveTargetingPackContent" Inputs="@(RefPackContent)" Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')"> + <RemoveDir Directories="$(TargetingPackLayoutRoot)" /> <Copy SourceFiles="@(RefPackContent)" DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" /> <Message Importance="High" Text="$(MSBuildProjectName) -> $(LayoutTargetDir)" /> </Target> - <ItemGroup> - <CreateDirectory Include="$(LocalInstallationOutputPath)" /> - </ItemGroup> - <!-- Workaround https://github.com/dotnet/sdk/issues/2910 by copying targeting pack into local installation. --> <Target Name="_InstallTargetingPackIntoLocalDotNet" DependsOnTargets="_ResolveTargetingPackContent" Inputs="@(RefPackContent)" Outputs="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')"> + <RemoveDir Directories="$(LocalInstallationOutputPath)" /> <Copy SourceFiles="@(RefPackContent)" DestinationFiles="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" /> diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index 101627fbfe0e4a63ba92a69608909a6ad56da093..aeb3c08f13825e1690bf47b09e5543ef352c385e 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -341,14 +341,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant <CrossgenPlatformAssembliesDir>$(IntermediateOutputPath)platformAssemblies\</CrossgenPlatformAssembliesDir> </PropertyGroup> - <ItemGroup> - <CreateDirectory Include="$(CrossgenToolDir)" /> - <CreateDirectory Include="$(CrossgenPlatformAssembliesDir)" /> - <CreateDirectory Include="$(SharedFxLayoutTargetDir)" /> - <CreateDirectory Include="$(RedistLayoutTargetDir)" /> - <CreateDirectory Include="$(LocalInstallationOutputPath)" /> - </ItemGroup> - <Target Name="Crossgen" DependsOnTargets="$(CrossgenDependsOn)" /> <Target Name="_ExpandRuntimePackageRoot"> @@ -378,6 +370,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Condition="'$(CrossgenOutput)' == 'true'" DependsOnTargets="_ExpandRuntimePackageRoot"> <!-- The output directories of assemblies built in this repo contain a mix of ref and impl assemblies. Copy impl assemblies to a separate directory. --> + <RemoveDir Directories="$(CrossgenPlatformAssembliesDir)" /> <Copy SourceFiles="@(ReferenceCopyLocalPaths)" DestinationFolder="$(CrossgenPlatformAssembliesDir)" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' != ''"/> <!-- Resolve list of assemblies to crossgen2 --> @@ -410,6 +403,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant <CrossgenSymbolsTargetDir Condition="HasTrailingSlash($(CrossgenSymbolsTargetDir)) AND '$(OS)' == 'Windows_NT'">$(TargetDir)\</CrossgenSymbolsTargetDir> </PropertyGroup> + <RemoveDir Directories="$(CrossgenToolDir)" /> <WriteLinesToFile Lines="@(Crossgen2PlatformAssemblyPaths)" File="$(CrossgenToolDir)PlatformAssembliesPathsCrossgen2.rsp" @@ -466,6 +460,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant PrivateUri="$(DotNetRuntimePrivateDownloadUrl)" PrivateUriSuffix="$(DotNetAssetRootAccessTokenSuffix)" DestinationPath="$(DotNetRuntimeArchive)" /> + <RemoveDir Directories="$(RedistSharedFrameworkLayoutRoot)" /> + <MakeDir Directories="$(RedistSharedFrameworkLayoutRoot)" /> <!-- Extract the dotnet-runtime archive --> <Exec Condition="'$(ArchiveExtension)' == '.tar.gz'" @@ -492,7 +488,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant DependsOnTargets="_ResolveSharedFrameworkContent" Inputs="@(SharedFxContent)" Outputs="@(SharedFxContent->'$(SharedFxLayoutTargetDir)%(FileName)%(Extension)')"> - + <RemoveDir Directories="$(SharedFrameworkLayoutRoot)" /> <Copy SourceFiles="@(SharedFxContent)" DestinationFiles="@(SharedFxContent->'$(SharedFxLayoutTargetDir)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" /> @@ -504,7 +500,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant DependsOnTargets="_ResolveSharedFrameworkContent" Inputs="@(SharedFxContent)" Outputs="@(SharedFxContent->'$(RedistLayoutTargetDir)%(FileName)%(Extension)')"> - + <RemoveDir Directories="$(RedistLayoutTargetDir)" /> <Copy SourceFiles="@(SharedFxContent)" DestinationFiles="@(SharedFxContent->'$(RedistLayoutTargetDir)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" /> @@ -518,7 +514,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Condition="'$(DotNetBuildFromSource)' != 'true'" Inputs="@(SharedFxContent)" Outputs="@(SharedFxContent->'$(LocalInstallationOutputPath)%(FileName)%(Extension)')"> - + <RemoveDir Directories="$(LocalInstallationOutputPath)" /> <Copy SourceFiles="@(SharedFxContent)" DestinationFiles="@(SharedFxContent->'$(LocalInstallationOutputPath)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" />