8000 Follow-up and fixes from outer/inner removal by ViktorHofer · Pull Request #423 · dotnet/dotnet · GitHub
[go: up one dir, main page]
Skip to content

Follow-up and fixes from outer/inner removal #423

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

Merged
merged 3 commits into from
May 7, 2025
Merged

Follow-up and fixes from outer/inner removal #423

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
8c7a539
Follow-up and fixes from outer/inner removal
ViktorHofer May 7, 2025
1345c99
fix newlines
ViktorHofer May 7, 2025
ce8e059
Update RepoLayout.props
ViktorHofer May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
8000 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 repo-projects/Directory.Build.props
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<CommonArgs>$(CommonArgs) /p:DotNetBuildSourceOnly=true</CommonArgs>
<CommonArgs>$(CommonArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PreviouslySourceBuiltPackagesPath)"</CommonArgs>
<CommonArgs>$(CommonArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</CommonArgs>
<CommonArgs>$(CommonArgs) /p:PrebuiltUsageReportDir="$(ArtifactsLogRepoDir)"</CommonArgs>
<CommonArgs>$(CommonArgs) /p:TrackPrebuiltUsageReportDir="$(ArtifactsLogRepoDir)"</CommonArgs>
</PropertyGroup>

<!-- Build specific args -->
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ steps:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish BuildLogs
targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/
targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
continueOnError: true
condition: succeededOrFailed()
Expand Down
6 changes: 5 additions & 1 deletion src/arcade/eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# CI mode - set to true on CI server for PR validation build or official build.
ci=${ci:-false}

# Build mode
source_build=${source_build:-false}

# Set to true to use the pipelines logger which will enable Azure logging output.
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
# This flag is meant as a temporary opt-opt for the feature while validate it across
Expand Down Expand Up @@ -58,7 +61,8 @@ use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}

# True to use global NuGet cache instead of restoring packages to repository-local directory.
if [[ "$ci" == true ]]; then
# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props.
if [[ "$ci" == true || "$source_build" == true ]]; then
use_global_nuget_cache=${use_global_nuget_cache:-false}
else
use_global_nuget_cache=${use_global_nuget_cache:-true}
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSolutionBuild.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Target Name="PerformanceTest" />

<Import Project="BuildReleasePackages.targets" Condition="'$(UsingToolNuGetRepack)' == 'true'" />
<Import Project="PrebuiltUsage.targets" Condition="'$(PrebuiltUsage)' == 'true'" />
<Import Project="TrackPrebuiltUsage.targets" Condition="'$(TrackPrebuiltUsage)' == 'true'" />

<!-- Repository extension point -->
<Import Project="$(RepositoryEngineeringDir)AfterSolutionBuild.targets" Condition="Exists('$(RepositoryEngineeringDir)AfterSolutionBuild.targets')"/>
Expand Down
6 changes: 4 additions & 2 deletions src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/RepoLayout.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@
<VisualStudioBuildPackagesDir>$([MSBuild]::NormalizeDirectory('$(VisualStudioSetupOutputPath)', 'DevDivPackages'))</VisualStudioBuildPackagesDir>
</PropertyGroup>

<!-- Keep in sync with eng/common/tools NUGET_PACKAGES env var defines. -->
<PropertyGroup>
<!-- Respect environment variable for the NuGet Packages Root if set. -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' != ''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)'))</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and '$(NUGET_PACKAGES)' != ''">$([MSBuild]::NormalizeDirectory('$(NUGET_PACKAGES)'))</NuGetPackageRoot>

<!-- If the PrebultUsage feature is enabled, don't fallback to default cache locations. -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and '$(PrebuiltUsage)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', '.prebuilt-packages'))</NuGetPackageRoot>
<!-- When building source-only or with the ci flag, don't fallback to default cache locations. -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and
('$(ContinuousIntegrationBuild)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true')">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.packages'))</NuGetPackageRoot>

<!-- Otherwise, use the current default location -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and '$(OS)' == 'Windows_NT'">$([MSBuild]::NormalizeDirectory('$(UserProfile)', '.nuget', 'packages'))</NuGetPackageRoot>
Expand Down
22 changes: 11 additions & 11 deletions ...et.Arcade.Sdk/tools/PrebuiltUsage.targets → ...cade.Sdk/tools/TrackPrebuiltUsage.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

<Target Name=" 8000 ;WritePrebuiltUsageData" AfterTargets="Build">
<PropertyGroup>
<PrebuiltUsageRootDir Condition="'$(PrebuiltUsageRootDir)' == ''">$(RepoRoot)</PrebuiltUsageRootDir>
<PrebuiltUsagePackageCache Condition="'$(PrebuiltUsagePackageCache)' == ''">$(NuGetPackageRoot)</PrebuiltUsagePackageCache>
<PrebuiltUsageReportDir Condition="'$(PrebuiltUsageReportDir)' == ''">$(ArtifactsLogDir)</PrebuiltUsageReportDir>
<PackageReportDataFile Condition="'$(PackageReportDataFile)' == ''">$(PrebuiltUsageReportDir)prebuilt-usage.xml</PackageReportDataFile>
<TrackPrebuiltUsageRootDir Condition="'$(TrackPrebuiltUsageRootDir)' == ''">$(RepoRoot)</TrackPrebuiltUsageRootDir>
<TrackPrebuiltUsagePackageCache Condition="'$(TrackPrebuiltUsagePackageCache)' == ''">$(NuGetPackageRoot)</TrackPrebuiltUsagePackageCache>
<TrackPrebuiltUsageReportDir Condition="'$(TrackPrebuiltUsageReportDir)' == ''">$(ArtifactsLogDir)</TrackPrebuiltUsageReportDir>
<TrackPrebuiltUsageReportFile Condition="'$(TrackPrebuiltUsageReportFile)' == ''">$(TrackPrebuiltUsageReportDir)prebuilt-usage.xml</TrackPrebuiltUsageReportFile>
</PropertyGroup>

<ItemGroup>
<AllRestoredPackageFiles Include="$(PrebuiltUsagePackageCache)**/*.nupkg" />
<AllRestoredPackageFiles Include="$(TrackPrebuiltUsagePackageCache)**/*.nupkg" />
<SourceBuiltPackageFiles Include="$(AdditionalSourceBuiltNupkgCacheDir)**/*.nupkg" Condition="'$(AdditionalSourceBuiltNupkgCacheDir)' != ''" />
<SourceBuiltPackageFiles Include="$(ReferencePackageNupkgCacheDir)**/*.nupkg" Condition="'$(ReferencePackageNupkgCacheDir)' != ''" />
<SourceBuiltPackageFiles Include="$(PreviouslySourceBuiltNupkgCacheDir)**/*.nupkg" Condition="'$(PreviouslySourceBuiltNupkgCacheDir)' != ''" />

<!-- Scan entire PrebuiltUsageRootDir, in case project.assets.json ends up in an unexpected place. -->
<ProjectDirectories Include="$(PrebuiltUsageRootDir)" />
<!-- Scan entire TrackPrebuiltUsageRootDir, in case project.assets.json ends up in an unexpected place. -->
<ProjectDirectories Include="$(TrackPrebuiltUsageRootDir)" />
</ItemGroup>

<WritePackageUsageData
Expand All @@ -32,15 +32,15 @@
PlatformsRuntimeJsonFiles="@(PlatformsRuntimeJsonFiles)"
TargetRid="$(TargetRid)"
ProjectDirectories="@(ProjectDirectories)"
RootDir="$(PrebuiltUsageRootDir)"
RootDir="$(TrackPrebuiltUsageRootDir)"
IgnoredProjectAssetsJsonFiles="@(IgnoredProjectAssetsJsonFiles)"
DataFile="$(PackageReportDataFile)"
DataFile="$(TrackPrebuiltUsageReportFile)"
ProjectAssetsJsonArchiveFile="$(ProjectAssetsJsonArchiveFile)" />

<WriteUsageReports
DataFile="$(PackageReportDataFile)"
DataFile="$(TrackPrebuiltUsageReportFile)"
PoisonedReportFile="$(PoisonedReportFile)"
OutputDirectory="$(PrebuiltUsageReportDir)" />
OutputDirectory="$(TrackPrebuiltUsageReportDir)" />
</Target>

</Project>
0