mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove tarball verbiage from source-build infrastructure (#15217)

Browse source
This commit is contained in:
Michael Simons 2023-01-10 08:50:31 -06:00 • committed by GitHub
parent 4d0eb54bdf
commit c5ebd18478
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/content/repo-projects/Directory.Build.props
View file

@ -39,7 +39,7 @@
<!-- A human-readable description of what's building and why. -->
<PropertyGroup>
<ProjectBuildReason>'$(RepositoryName) in tarball'</ProjectBuildReason>
<ProjectBuildReason>'$(RepositoryName)'</ProjectBuildReason>
</PropertyGroup>
<ItemGroup>

4
src/SourceBuild/content/repo-projects/Directory.Build.targets
View file

@ -150,7 +150,7 @@
NewText="_InitializeBuildToolFramework=&quot;%24{_OverrideArcadeInitializeBuildToolFramework-netcoreapp3.1}&quot;" />
<!-- Temporary workaround for when the ci option is specified, non-zero exit are swallowed which prevents builds from failing within
the tarball build preocess. https://github.com/dotnet/source-build/issues/2307 -->
the build process. https://github.com/dotnet/source-build/issues/2307 -->
<ReplaceTextInFile InputFile="$(EngCommonToolsShFile)"
OldText="ExitWithExitCode 0"
NewText="ExitWithExitCode $exit_code" />
@ -702,7 +702,7 @@
<AllRestoredPackageFiles Include="$(LocalNuGetPackagesRoot)**/*.nupkg" />
<AllRestoredPackageFiles Include="$(PackagesDir)**/*.nupkg" />
<!-- Only contains packages when building a tarball. -->
<!-- Only contains packages when building. -->
<TarballPrebuiltPackageFiles Include="$(PrebuiltPackagesPath)*.nupkg" />
<SourceBuiltPackageFiles Include="$(SourceBuiltBlobFeedDir)**/*.nupkg" />

2
src/SourceBuild/content/repo-projects/known-good.proj
View file

@ -53,8 +53,8 @@
<RepositoryReference Include="aspnetcore" />
<RepositoryReference Include="deployment-tools" />
<RepositoryReference Include="format" />
<RepositoryReference Include="nuget-client" />
<RepositoryReference Include="templating" />
<RepositoryReference Include="nuget-client" />
<RepositoryReference Include="test-templates" />
<!-- Tier 5 -->

2
src/SourceBuild/content/repo-projects/msbuild.proj
View file

@ -39,7 +39,7 @@
The CentralPackageVersions SDK isn't actually source-built. We get it as a text-only prebuilt,
but the NuGet resolver seems flaky so we're using our resolver instead. We only have access to
the nupkg ahead of time when building a tarball, so only enable this workaround then.
the nupkg ahead of time when building, so only enable this workaround then.
-->
<ItemGroup>
<CentralPackageVersionsSdkOverride Include="Microsoft.Build.CentralPackageVersions" Group="CENTRAL_PACKAGE_VERSIONS" />

3
src/SourceBuild/content/repo-projects/templating.proj
View file

@ -14,8 +14,7 @@
</PropertyGroup>
<ItemGroup>
<!-- TODO: Renable once nuget-client is building in tarball -->
<!-- <RepositoryReference Include="nuget-client" /> -->
<RepositoryReference Include="nuget-client" />
<RepositoryReference Include="source-build-externals" />
</ItemGroup>