Skip to content

Commit 8d73aaa

Browse files
Update dependencies (#37493)
[release/10.0] Source code updates from dotnet/dotnet
1 parent 540d01a commit 8d73aaa

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
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-7aa15f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7aa15f07/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-976695d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-976695d4/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<!-- End: Package sources from dotnet-runtime -->

eng/Version.Details.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25631.101</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25631.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25631.101</MicrosoftDotNetHelixSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26062.108</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26062.108</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26062.108</MicrosoftDotNetHelixSdkPackageVersion>
1212
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.3</MicrosoftExtensionsCachingMemoryPackageVersion>
1313
<MicrosoftExtensionsConfigurationPackageVersion>10.0.3</MicrosoftExtensionsConfigurationPackageVersion>
1414
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.3</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
1515
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
1616
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
1717
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
1818
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.3</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.3-servicing.25631.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.3-servicing.26062.108</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
2020
<MicrosoftExtensionsLoggingPackageVersion>10.0.3</MicrosoftExtensionsLoggingPackageVersion>
2121
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.3-servicing.25631.101</MicrosoftNETCorePlatformsPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.3-servicing.26062.108</MicrosoftNETCorePlatformsPackageVersion>
2323
<SystemFormatsAsn1PackageVersion>10.0.3</SystemFormatsAsn1PackageVersion>
2424
<SystemRuntimeCachingPackageVersion>10.0.3</SystemRuntimeCachingPackageVersion>
2525
<SystemTextEncodingsWebPackageVersion>10.0.3</SystemTextEncodingsWebPackageVersion>

eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="7aa15f07c40a487d471b5df81e26e6b8c06c9461" BarId="295835" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="976695d40cfde0801c78b8fed85ca80e997da085" BarId="297004" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.3">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
7+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
88
</Dependency>
99
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
11+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.3">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
15+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
1616
</Dependency>
1717
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.3">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
19+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.3">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
23+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.3">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
27+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.3">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
31+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.3-servicing.25631.101">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.3-servicing.26062.108">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
35+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.3">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
39+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
4040
</Dependency>
4141
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.3">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
43+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.3-servicing.25631.101">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.3-servicing.26062.108">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
47+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Text.Json" Version="10.0.3">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
51+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
5252
</Dependency>
5353
<Dependency Name="System.Text.Encodings.Web" Version="10.0.3">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
55+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Asn1" Version="10.0.3">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
59+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
6060
</Dependency>
6161
<Dependency Name="System.Runtime.Caching" Version="10.0.3">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
63+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25631.101">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26062.108">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
69+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25631.101">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26062.108">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
73+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25631.101">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26062.108">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>7aa15f07c40a487d471b5df81e26e6b8c06c9461</Sha>
77+
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

eng/common/templates-official/post-build/setup-maestro-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ steps:
55
is1ESPipeline: true
66

77
${{ each parameter in parameters }}:
8-
${{ parameter.key }}: ${{ parameter.value }}
8+
${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25631.101",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25631.101"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.108",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26062.108"
2323
}
2424
}

0 commit comments

Comments
 (0)