Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] [IGNORE] #41948

Closed
wants to merge 3 commits into from
Closed

[WIP] [IGNORE] #41948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb12b4
Add nuget with additional logging
akoeplinger Jul 3, 2024
a006d63
Remove templating
akoeplinger Jul 4, 2024
a2e3d8f
Disable tests
akoeplinger Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ parameters:

- name: runTests
type: boolean
default: true
default: false

# Freeform field for extra values to pass to build.sh for special build modes
- name: extraProperties
Expand Down
6 changes: 6 additions & 0 deletions src/SourceBuild/content/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ function Build {

InitializeToolset

"$DOTNET_INSTALL_DIR/dotnet" build-server shutdown

tdnf install -y unzip || true

unzip -o -j "$scriptroot/eng/nuget-files.zip" -d "$DOTNET_INSTALL_DIR/sdk/9.0.100-preview.6.24311.23/"

# Manually unset NUGET_PACKAGES as InitializeToolset sets it unconditionally.
# The env var shouldn't be set so that the RestorePackagesPath msbuild property is respected.
unset NUGET_PACKAGES
Expand Down
4 changes: 4 additions & 0 deletions src/SourceBuild/content/eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ if ($dev) {
function Build {
InitializeToolset

& "$env:DOTNET_INSTALL_DIR\dotnet.exe" build-server shutdown

Expand-Archive -Force -Path $PSScriptRoot\nuget-files.zip -Destination $env:DOTNET_INSTALL_DIR\sdk\9.0.100-preview.6.24311.23\

# Manually unset NUGET_PACKAGES as InitializeToolset sets it unconditionally.
# The env var shouldn't be set so that the RestorePackagesPath msbuild property is respected.
$env:NUGET_PACKAGES=''
Expand Down
Binary file added src/SourceBuild/content/eng/nuget-files.zip
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" />
<TransitiveRepositoryReference Include="@(_TransitiveRepositoryReference)" KeepDuplicates="false" />
</ItemGroup>

<!-- Exclude repositories that currently don't build when not building source-only. -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<TransitiveRepositoryReference Remove="templating" />
</ItemGroup>
</Target>

<!-- Wraps the transitive repo references with additional metadata -->
Expand Down
Loading