Skip to content

Commit 310c3e3

Browse files
phil-allen-msftphil-allen-msft
authored
Merge pull request #1566 from dotnet/darc-main-f43a5a8f-d3b4-4d7b-9704-bd7e90e8648b
[main] Source code updates from dotnet/dotnet
2 parents 8573980 + ee08acc commit 310c3e3

7 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎eng/Signing.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<!-- Ensure that MacOS sourcelink shims get signed properly -->
4+
<FileSignInfo Include="sourcelink" CertificateName="MacDeveloperHarden" ExecutableType="MachO" />
5+
</ItemGroup>
6+
</Project>

‎eng/Version.Details.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25619.109</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>3.0.0-alpha.1.25619.109</SystemCommandLinePackageVersion>
11-
<SystemIOHashingPackageVersion>11.0.0-alpha.1.25619.109</SystemIOHashingPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26060.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26060.102</SystemCommandLinePackageVersion>
11+
<SystemIOHashingPackageVersion>11.0.0-alpha.1.26060.102</SystemIOHashingPackageVersion>
1212
</PropertyGroup>
1313
<!--Property group for alternate package version names-->
1414
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="5661a2c0a84a3fd32916395b254ce50e5ad7e9fe" BarId="295411" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="db3b7424251b47d9474dbbe3b4fa7a81fe2915b7" BarId="296788" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.25619.109">
5+
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26060.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
7+
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
88
</Dependency>
9-
<Dependency Name="System.IO.Hashing" Version="11.0.0-alpha.1.25619.109">
9+
<Dependency Name="System.IO.Hashing" Version="11.0.0-alpha.1.26060.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
11+
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
1212
</Dependency>
1313
</ProductDependencies>
1414
<ToolsetDependencies>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25619.109">
15+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26060.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</Sha>
17+
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/common/core-templates/steps/install-microbuild-impl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ parameters:
1818
type: boolean
1919

2020
steps:
21-
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
21+
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
2222
- task: MicroBuildSigningPluginPreview@4
2323
displayName: Install Preview MicroBuild plugin
2424
inputs: ${{ parameters.microbuildTaskInputs }}

‎eng/common/core-templates/steps/source-index-stage1-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ steps:
1414
workingDirectory: $(Agent.TempDirectory)
1515

1616
- script: |
17-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
17+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
1919
displayName: "Source Index: Download netsourceindex Tools"
2020
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
2121
workingDirectory: $(Agent.TempDirectory)

‎eng/common/native/install-dependencies.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ case "$os" in
2727
libssl-dev libkrb5-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
30-
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
30+
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
3131
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
3232
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
3333
elif [ "$ID" = "amzn" ]; then

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100",
3+
"version": "11.0.100-alpha.1.25618.104",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,10 +10,10 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100"
13+
"dotnet": "11.0.100-alpha.1.25618.104"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25619.109",
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26060.102",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)