Skip to content

Commit c09bef7

Browse files
dotnet-maestro[bot]Shyam-Gupta
dotnet-maestro[bot]
and
Shyam-Gupta
authored
[release/10.0] Source code updates from dotnet/dotnet (#14264)
* Update dependencies * Update package source key in NuGet.config --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Shyam Gupta <shgu@microsoft.com>
1 parent eea9756 commit c09bef7

File tree

5 files changed

+50
-50
lines changed

5 files changed

+50
-50
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-52be957" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-52be9573/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-3fda132" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-3fda1320/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -21,7 +21,7 @@
2121
</packageSources>
2222
<packageSourceMapping>
2323
<clear />
24-
<packageSource key="darc-pub-dotnet-dotnet-52be957">
24+
<packageSource key="darc-pub-dotnet-dotnet-3fda132">
2525
<package pattern="Microsoft.*" />
2626
<package pattern="runtime.*" />
2727
<package pattern="System.*" />

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26102.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26103.106</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
1616
<MicrosoftNETSdkILPackageVersion>10.0.4</MicrosoftNETSdkILPackageVersion>
1717
<MicrosoftNETCoreAppRefPackageVersion>10.0.4</MicrosoftNETCoreAppRefPackageVersion>
1818
<MicrosoftNETCoreILAsmPackageVersion>10.0.4</MicrosoftNETCoreILAsmPackageVersion>
1919
<MicrosoftNETCoreILDAsmPackageVersion>10.0.4</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.4-servicing.26102.102</MicrosoftNETCorePlatformsPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.4-servicing.26103.106</MicrosoftNETCorePlatformsPackageVersion>
2121
<MicrosoftWin32SystemEventsPackageVersion>10.0.4</MicrosoftWin32SystemEventsPackageVersion>
2222
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.4</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
2323
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.4</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="52be957329989783be8d83769123a17e3c251da0" BarId="299888" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="3fda132048f5089da6722646c397a9e43928c987" BarId="300146" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.4-servicing.26102.102">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.4-servicing.26103.106">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
13+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
1414
</Dependency>
1515
<Dependency Name="System.Resources.Extensions" Version="10.0.4">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
17+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
1818
</Dependency>
1919
<Dependency Name="System.Windows.Extensions" Version="10.0.4">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
21+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
2222
</Dependency>
2323
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.4">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
25+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
2626
</Dependency>
2727
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.4">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
29+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
3030
</Dependency>
3131
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.4">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
33+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
3434
</Dependency>
3535
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.4">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
37+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
3838
</Dependency>
3939
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.4">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
41+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
4242
</Dependency>
4343
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.4">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
45+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
4646
</Dependency>
4747
<Dependency Name="System.Text.Encodings.Web" Version="10.0.4">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
49+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
5050
</Dependency>
5151
<Dependency Name="System.Text.Json" Version="10.0.4">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
53+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.4">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
57+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
5858
</Dependency>
5959
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.4">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
61+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
6262
</Dependency>
6363
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.4">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
65+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
6666
</Dependency>
6767
<Dependency Name="System.CodeDom" Version="10.0.4">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
69+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
7070
</Dependency>
7171
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.4">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
73+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
7474
</Dependency>
7575
<Dependency Name="System.Formats.Nrbf" Version="10.0.4">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
77+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
7878
</Dependency>
7979
<Dependency Name="System.IO.Hashing" Version="10.0.4">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
81+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26102.102">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26103.106">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
88+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26102.102">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26103.106">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
92+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26102.102">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26103.106">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
96+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26102.102">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26103.106">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
100+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26102.102">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26103.106">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
104+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26102.102">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26103.106">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
108+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26102.102">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26103.106">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>52be957329989783be8d83769123a17e3c251da0</Sha>
112+
<Sha>3fda132048f5089da6722646c397a9e43928c987</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
6666
image: Azure-Linux-3-Amd64
@@ -69,10 +69,10 @@ jobs:
6969
pool:
7070
${{ if eq(variables['System.TeamProject'], 'public') }}:
7171
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
72-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
72+
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
7373
${{ if eq(variables['System.TeamProject'], 'internal') }}:
7474
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
75-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
75+
demands: ImageOverride -equals Azure-Linux-3-Amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26102.102",
25-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.26102.102",
26-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26102.102",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.106",
25+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.26103.106",
26+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26103.106",
2727
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2828
"Microsoft.NET.Sdk.IL": "10.0.4"
2929
},

0 commit comments

Comments
 (0)