8000 [main] Source code updates from dotnet/dotnet by dotnet-maestro[bot] · Pull Request #1248 · dotnet/source-build-reference-packages · GitHub
[go: up one dir, main page]
Skip to content

[main] Source code updates from dotnet/dotnet #1248

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 7 commits into from
May 7, 2025
Merged

[main] Source code updates from dotnet/dotnet #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
578caeb
[VMR] Codeflow e6e6052-e6e6052
dotnet-maestro[bot] May 7, 2025
ba2b9ca
Merging main into darc-main-89fae0ef-7c3a-46e1-a6dc-3842e3b2a589
dotnet-maestro[bot] May 7, 2025
e667774
Update dependencies from https://github.com/dotnet/dotnet build 267041
dotnet-maestro[bot] May 7, 2025
3c6ded6
Fix test locations
ViktorHofer May 7, 2025
00095d7
fix
ViktorHofer May 7, 2025
54b0ddb
Try to fix publish logs target path
ViktorHofer May 7, 2025
4a6de24
syntax fix
ViktorHofer May 7, 2025
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
6 changes: 1 addition & 5 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,4 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_MULTILEVEL_LOOKUP=0

if [[ $@ == *"DotNetBuildInnerRepo=true"* ]]; then
"$scriptroot/eng/common/build.sh" --build --restore --pack "$@"
else
"$scriptroot/eng/common/build.sh" -sb "$@"
fi
"$scriptroot/eng/common/build.sh" -sb "$@"
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="86c2177121ebf8d49b372dd7232588ceaae6c7cb" BarId="266849" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="025e4e597746eafc5a736195b66aeb321455d64c" BarId="267041" />
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25252.107">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25256.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25252.107">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25256.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25252.107</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25256.101</MicrosoftDotNetGenAPITaskPackageVersion>
<!-- xUnit dependencies -->
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
</PropertyGroup>
Expand Down
30 changes: 1 addition & 29 deletions 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 @@ -19,19 +19,6 @@ steps:
set -x
df -h

# If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo.
internalRestoreArgs=
if ! git diff --quiet; then
internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
# The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
# This only works if there is a username/email configured, which won't be the case in most CI runs.
git config --get user.email
if [ $? -ne 0 ]; then
git config user.email dn-bot@microsoft.com
git config user.name dn-bot
fi
fi

# If building on the internal project, the internal storage variable may be available (usually only if needed)
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
# in the default public locations.
Expand Down Expand Up @@ -71,7 +58,6 @@ steps:
--restore --build --pack -bl \
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
Expand All @@ -80,26 +66,12 @@ steps:
/p:DotNetBuildRepo=true \
displayName: Build

# Upload build logs for diagnosis.
- task: CopyFiles@2
displayName: Prepare BuildLogs staging directory
inputs:
SourceFolder: '$(Build.SourcesDirectory)'
Contents: |
**/*.log
**/*.binlog
artifacts/sb/prebuilt-report/**
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
CleanTargetFolder: true
continueOnError: true
condition: succeededOrFailed()

- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish BuildLogs
targetPath: '$(Build.StagingDirectory)/BuildLogs'
targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
continueOnError: true
condition: succeededOrFailed()
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "10.0.100-preview.3.25201.16"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25256.101",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
16 changes: 3 additions & 13 deletions tests/SbrpTests/PathUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,8 @@ namespace SbrpTests;

internal static class PathUtilities
{
public static string GetRepoRoot() =>
(string)AppContext.GetData("SbrpTests.RepoRoot")!;
public static string GetRepoRoot() => (string)AppContext.GetData("SbrpTests.RepoRoot")!;

public static string GetSourceBuildRepoRoot()
{
var artifactsDir = (string)AppContext.GetData("SbrpTests.ArtifactsDir")!;
return Path.Combine(artifactsDir, "sb", "src");
}

public static string GetSourceBuildPackagesShippingDir()
{
var configuration = (string)AppContext.GetData("SbrpTests.Configuration")!;
return Path.Combine(GetSourceBuildRepoRoot(), "artifacts", "packages", configuration, "Shipping");
}
public static string GetArtifactsShippingPackagesDir() =>
(string)AppContext.GetData("SbrpTests.ArtifactsShippingPackagesDir")!;
}
8 changes: 2 additions & 6 deletions tests/SbrpTests/Sbrp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@
<Value>$(RepoRoot)</Value>
</RuntimeHostConfigurationOption>

<RuntimeHostConfigurationOption Include="SbrpTests.Configuration">
<Value>$(Configuration)</Value>
</RuntimeHostConfigurationOption>

<RuntimeHostConfigurationOption Include="SbrpTests.ArtifactsDir">
<Value>$(ArtifactsDir)</Value>
<RuntimeHostConfigurationOption Include="SbrpTests.ArtifactsShippingPackagesDir">
<Value>$(ArtifactsShippingPackagesDir)</Value>
</RuntimeHostConfigurationOption>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions tests/SbrpTests/ValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void ValidateSbrpAttribute()
string[] packages = GetPackages();

HashSet<string> textOnlyPacks = new(
Directory.GetDirectories(Path.Combine(PathUtilities.GetSourceBuildRepoRoot(), "src/textOnlyPackages/src"))
Directory.GetDirectories(Path.Combine(PathUtilities.GetRepoRoot(), "src/textOnlyPackages/src"))
.Select(x => Path.GetFileName(x).ToLower())
);

Expand Down Expand Up @@ -99,7 +99,7 @@ public async Task ValidateSignatures()

private static string[] GetPackages()
{
string buildPackagesDirectory = PathUtilities.GetSourceBuildPackagesShippingDir();
string buildPackagesDirectory = PathUtilities.GetArtifactsShippingPackagesDir();

string[] packages = Directory.GetFiles(buildPackagesDirectory, "*.nupkg", SearchOption.AllDirectories);

Expand Down
0