Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26378.118</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-rc.1.26378.118</SystemCommandLinePackageVersion>
<SystemIOHashingPackageVersion>11.0.0-rc.1.26378.118</SystemIOHashingPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-rc.1.26378.118</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-rc.1.26378.118</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26401.101</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-rc.1.26401.101</SystemCommandLinePackageVersion>
<SystemIOHashingPackageVersion>11.0.0-rc.1.26401.101</SystemIOHashingPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-rc.1.26401.101</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-rc.1.26401.101</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53" BarId="324827" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="5da2de22f7c6e2ebe7ed4c16c614b00183145d3c" BarId="325270" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="3.0.0-rc.1.26378.118">
<Dependency Name="System.CommandLine" Version="3.0.0-rc.1.26401.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53</Sha>
<Sha>5da2de22f7c6e2ebe7ed4c16c614b00183145d3c</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="11.0.0-rc.1.26378.118">
<Dependency Name="System.IO.Hashing" Version="11.0.0-rc.1.26401.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53</Sha>
<Sha>5da2de22f7c6e2ebe7ed4c16c614b00183145d3c</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-rc.1.26378.118">
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-rc.1.26401.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53</Sha>
<Sha>5da2de22f7c6e2ebe7ed4c16c614b00183145d3c</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-rc.1.26378.118">
<Dependency Name="System.Text.Json" Version="11.0.0-rc.1.26401.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53</Sha>
<Sha>5da2de22f7c6e2ebe7ed4c16c614b00183145d3c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26378.118">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26401.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>43cdb1f62dde1df80d5f9c3532c8cfacbbc40f53</Sha>
<Sha>5da2de22f7c6e2ebe7ed4c16c614b00183145d3c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
10 changes: 9 additions & 1 deletion eng/common/core-templates/job/helix-job-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
os: linux
demands: ImageOverride -equals build.azurelinux.3.amd64.open
${{ else }}:
name: $(DncEngInternalBuildPool)
os: linux
demands: ImageOverride -equals build.azurelinux.3.amd64
steps:
- checkout: self
Expand Down Expand Up @@ -198,12 +200,18 @@ jobs:

# Fall back to Azure DevOps-provided environment variables when the caller did not
# supply organization / repository explicitly. BUILD_REPOSITORY_NAME is typically
# 'owner/repo' for GitHub-backed builds.
# 'owner/repo' for GitHub-backed builds and 'owner-repo' for internal builds.
if [ -z "$organization" ] || [ -z "$repository" ]; then
buildRepoName="${BUILD_REPOSITORY_NAME:-}"
if [ -n "$buildRepoName" ] && [[ "$buildRepoName" == */* ]]; then
repoOwner="${buildRepoName%%/*}"
repoName="${buildRepoName#*/}"
elif [ -n "$buildRepoName" ] && [[ "$buildRepoName" == *-* ]]; then
repoOwner="${buildRepoName%%-*}"
repoName="${buildRepoName#*-}"
fi

if [ -n "${repoOwner:-}" ] && [ -n "${repoName:-}" ]; then
if [ -z "$organization" ]; then organization="$repoOwner"; fi
if [ -z "$repository" ]; then repository="$repoName"; fi
fi
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/steps/publish-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ steps:
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
'$(akams-client-id)'
'$(System.AccessToken)'
${{parameters.CustomSensitiveDataList}}
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dotnet": "11.0.100-preview.6.26359.118"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26378.118",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26401.101",
"Microsoft.Build.NoTargets": "3.7.0"
}
}