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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26372.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26373.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8</Sha>
<Sha>24c548a0d3de04c06530d87dff376a37a0a0c723</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26372.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26373.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8</Sha>
<Sha>24c548a0d3de04c06530d87dff376a37a0a0c723</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.26372.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.26373.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8</Sha>
<Sha>24c548a0d3de04c06530d87dff376a37a0a0c723</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26372.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26373.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8</Sha>
<Sha>24c548a0d3de04c06530d87dff376a37a0a0c723</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26372.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26373.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c1a1bdaf2e0c38aeede7ed8cd2ec6fd4694aaa8</Sha>
<Sha>24c548a0d3de04c06530d87dff376a37a0a0c723</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</PropertyGroup>
<!-- Arcade dependencies -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26372.4</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.26372.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26372.4</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26373.4</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.26373.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26373.4</MicrosoftDotNetGenAPIPackageVersion>
</PropertyGroup>
<!-- Additional dependencies -->
<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions eng/common/core-templates/job/helix-job-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ jobs:
--use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}'
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
--stage-name '$(System.StageName)'
--stage-attempt '$(System.StageAttempt)'
)

organization='${{ parameters.organization }}'
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ usage()
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
echo " for FreeBSD can be: freebsd14, freebsd15"
echo " for OpenBSD can be: openbsd"
echo " for OpenBSD can be: openbsd7.8, openbsd7.9"
echo " for illumos can be: illumos"
echo " for Haiku can be: haiku."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"version": "11.0.100-preview.5.26302.115"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26372.4",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26372.4"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26373.4",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26373.4"
}
}
Loading