diff --git a/build.sh b/build.sh index a1812ac34..346e95fcc 100755 --- a/build.sh +++ b/build.sh @@ -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 "$@" \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef472741f..f2a09645e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c - + https://github.com/dotnet/dotnet - 86c2177121ebf8d49b372dd7232588ceaae6c7cb + 025e4e597746eafc5a736195b66aeb321455d64c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fe3412cb2..05a78d2b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 6.0.0-preview.6.21352.12 6.0.0-preview.6.21352.12 - 10.0.100-preview.5.25252.107 + 10.0.100-preview.5.25256.101 1.4.13 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 9292c9b67..c7c062e88 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -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. @@ -71,7 +58,6 @@ steps: --restore --build --pack -bl \ ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ $targetRidArgs \ $runtimeOsArgs \ $baseOsArgs \ @@ -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() diff --git a/global.json b/global.json index d1cc43e75..c8f42f295 100644 --- a/global.json +++ b/global.json @@ -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" } } diff --git a/tests/SbrpTests/PathUtilities.cs b/tests/SbrpTests/PathUtilities.cs index 61e5f8578..373784074 100644 --- a/tests/SbrpTests/PathUtilities.cs +++ b/tests/SbrpTests/PathUtilities.cs @@ -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")!; } diff --git a/tests/SbrpTests/Sbrp.Tests.csproj b/tests/SbrpTests/Sbrp.Tests.csproj index ea8ef3b82..5f18680dd 100644 --- a/tests/SbrpTests/Sbrp.Tests.csproj +++ b/tests/SbrpTests/Sbrp.Tests.csproj @@ -15,12 +15,8 @@ $(RepoRoot) - - $(Configuration) - - - - $(ArtifactsDir) + + $(ArtifactsShippingPackagesDir) diff --git a/tests/SbrpTests/ValidationTests.cs b/tests/SbrpTests/ValidationTests.cs index f85e1f551..0ec6f1df9 100644 --- a/tests/SbrpTests/ValidationTests.cs +++ b/tests/SbrpTests/ValidationTests.cs @@ -39,7 +39,7 @@ public void ValidateSbrpAttribute() string[] packages = GetPackages(); HashSet 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()) ); @@ -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);