Skip to content

Commit f43164b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 289051 (#37049)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25528.106 -> 10.0.0-beta.25530.104) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0 -> 10.0.0) Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.NETCore.Platforms (Version 10.0.0-rtm.25528.106 -> 10.0.0-rtm.25530.104) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 6f7a99a commit f43164b

File tree

5 files changed

+39
-40
lines changed

5 files changed

+39
-40
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-bbafab7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-bbafab7b/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-e50f95b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e50f95bd/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.25528.106</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetHelixSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetHelixSdkPackageVersion>
1212
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0</MicrosoftExtensionsCachingMemoryPackageVersion>
1313
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0</MicrosoftExtensionsConfigurationPackageVersion>
1414
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
1515
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
1616
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
1717
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
1818
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25528.106</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25530.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
2020
<MicrosoftExtensionsLoggingPackageVersion>10.0.0</MicrosoftExtensionsLoggingPackageVersion>
2121
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25528.106</MicrosoftNETCorePlatformsPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25530.104</MicrosoftNETCorePlatformsPackageVersion>
2323
<SystemFormatsAsn1PackageVersion>10.0.0</SystemFormatsAsn1PackageVersion>
2424
<SystemRuntimeCachingPackageVersion>10.0.0</SystemRuntimeCachingPackageVersion>
2525
<SystemTextEncodingsWebPackageVersion>10.0.0</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="bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05" BarId="288919" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="e50f95bd9940ada4c74fee327bb3e7146523db1c" BarId="289051" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
7+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
88
</Dependency>
99
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
11+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
15+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
1616
</Dependency>
1717
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
19+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
23+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
27+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
31+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25528.106">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25530.104">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
35+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
39+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
4040
</Dependency>
4141
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
43+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25528.106">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25530.104">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
47+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Text.Json" Version="10.0.0">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
51+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
5252
</Dependency>
5353
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
55+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Asn1" Version="10.0.0">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
59+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
6060
</Dependency>
6161
<Dependency Name="System.Runtime.Caching" Version="10.0.0">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
63+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25528.106">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25530.104">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
69+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25528.106">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25530.104">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
73+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25528.106">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25530.104">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
77+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ parameters:
1111
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1212
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1313
microbuildUseESRP: true
14-
# Location of the MicroBuild output folder
15-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
16-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
1714

1815
continueOnError: false
1916

2017
steps:
2118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2219
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
23-
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
20+
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
2421
- task: UseDotNet@2
2522
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2623
inputs:
2724
packageType: sdk
2825
version: 8.0.x
29-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
30-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
26+
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
27+
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
28+
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
29+
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
3130
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3231

3332
- script: |
@@ -65,7 +64,7 @@ steps:
6564
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
6665
env:
6766
TeamName: $(_TeamName)
68-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
67+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
6968
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7069
continueOnError: ${{ parameters.continueOnError }}
7170
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
8584
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
8685
env:
8786
TeamName: $(_TeamName)
88-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
87+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
8988
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9089
continueOnError: ${{ parameters.continueOnError }}
9190
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎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.25528.106",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25530.104",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25530.104"
2323
}
2424
}

0 commit comments

Comments
 (0)