Skip to content

Commit 71e0ada

Browse files
authored
Move most of the tarball build into MSBuild (#1583)
1 parent b42614b commit 71e0ada

13 files changed

+604
-394
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
<BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
111111
<OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
112112
<IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>
113-
<GeneratedSourcePathOnline>$(IntermediatePath)generatedSrc</GeneratedSourcePathOnline>
114-
<GeneratedSourcePathOffline>$(SubmoduleDirectory)generatedSrc</GeneratedSourcePathOffline>
113+
<GeneratedSourcePathOnline>$(IntermediatePath)generatedSrc/</GeneratedSourcePathOnline>
114+
<GeneratedSourcePathOffline>$(SubmoduleDirectory)generatedSrc/</GeneratedSourcePathOffline>
115115
<LocalBlobStorageRoot>$(IntermediatePath)blobs/</LocalBlobStorageRoot>
116116
<LocalNuGetPackagesRoot>$(IntermediatePath)nuget-packages/</LocalNuGetPackagesRoot>
117117
<SourceBuiltBlobFeedDir>$(IntermediatePath)blob-feed/</SourceBuiltBlobFeedDir>

Directory.Build.targets

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,43 @@
1010
</ItemGroup>
1111
</Target>
1212

13+
<Target Name="AcquireDarc"
14+
Condition="
15+
'$(OfflineBuild)' != 'true' and
16+
'$(SkipAcquireDarc)' != 'true'">
17+
<MSBuild
18+
Projects="$(MSBuildThisFileDirectory)tools-local\acquire-darc\acquire-darc.proj"
19+
Targets="AcquireDarcCore" />
20+
</Target>
21+
22+
<Target Name="GetCommonDarcCloneCommand" DependsOnTargets="AcquireDarc">
23+
<PropertyGroup>
24+
<IgnoredRepos>$(IgnoredRepos);https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</IgnoredRepos>
25+
<IgnoredRepos>$(IgnoredRepos);https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted</IgnoredRepos>
26+
<IgnoredRepos>$(IgnoredRepos);https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted</IgnoredRepos>
27+
<IgnoredRepos>$(IgnoredRepos);https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-optimization</IgnoredRepos>
28+
<IgnoredRepos>$(IgnoredRepos);https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</IgnoredRepos>
29+
<IgnoredRepos>$(IgnoredRepos);https://github.com/dotnet/source-build-reference-packages</IgnoredRepos>
30+
31+
<DarcCloneReposFolder Condition="'$(DarcCloneReposFolder)' == ''">$(ClonedSubmoduleDirectory)</DarcCloneReposFolder>
32+
33+
<DarcCloneArguments>$(DarcCloneArguments) --git-dir-folder $(ClonedSubmoduleGitRootDirectory)</DarcCloneArguments>
34+
<DarcCloneArguments>$(DarcCloneArguments) --include-toolset</DarcCloneArguments>
35+
<DarcCloneArguments>$(DarcCloneArguments) --ignore-repos "$(IgnoredRepos)"</DarcCloneArguments>
36+
<DarcCloneArguments>$(DarcCloneArguments) --debug</DarcCloneArguments>
37+
38+
<!-- required so Darc doesn't throw an error for missing auth -->
39+
<AzDoPat Condition="'$(AzDoPat)' == ''">bogus</AzDoPat>
40+
<DarcCloneArguments>$(DarcCloneArguments) --azdev-pat $(AzDoPat)</DarcCloneArguments>
41+
<DarcCloneArguments>$(DarcCloneArguments) --github-pat bogus</DarcCloneArguments>
42+
43+
<!-- depth 0 should be sufficient for us since we explictly declare all our dependencies -->
44+
<DarcCloneArguments>$(DarcCloneArguments) --depth 0</DarcCloneArguments>
45+
46+
<DarcCloneCommand>$(DotNetCliToolDir)dotnet $(DarcDll) clone $(DarcCloneArguments)</DarcCloneCommand>
47+
</PropertyGroup>
48+
</Target>
49+
1350
<Import Condition="'$(SkipArcadeSdkImport)' != 'true'" Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
1451

1552
<Target Name="GetProdConBlobFeedUrl">

0 commit comments

Comments
 (0)