Skip to content

Commit 60f4016

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#38308)
[release/10.0] Source code updates from dotnet/dotnet
1 parent 9f1612f commit 60f4016

6 files changed

Lines changed: 44 additions & 44 deletions

File tree

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

‎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}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-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/templates/steps/vmr-sync.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ steps:
4545
workingDirectory: ${{ parameters.vmrPath }}
4646

4747
- script: |
48-
./eng/common/vmr-sync.sh \
49-
--vmr ${{ parameters.vmrPath }} \
50-
--tmp $(Agent.TempDirectory) \
51-
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
52-
--ci \
48+
./eng/common/vmr-sync.sh \
49+
--vmr ${{ parameters.vmrPath }} \
50+
--tmp $(Agent.TempDirectory) \
51+
--azdev-pat '$(AzdoToken)' \
52+
--ci \
5353
--debug
5454
5555
if [ "$?" -ne 0 ]; then
@@ -67,11 +67,11 @@ steps:
6767
condition: eq(variables['Agent.OS'], 'Windows_NT')
6868

6969
- powershell: |
70-
./eng/common/vmr-sync.ps1 `
71-
-vmr ${{ parameters.vmrPath }} `
72-
-tmp $(Agent.TempDirectory) `
73-
-azdevPat '$(dn-bot-all-orgs-code-r)' `
74-
-ci `
70+
./eng/common/vmr-sync.ps1 `
71+
-vmr ${{ parameters.vmrPath }} `
72+
-tmp $(Agent.TempDirectory) `
73+
-azdevPat '$(AzdoToken)' `
74+
-ci `
7575
-debugOutput
7676
7777
if ($LASTEXITCODE -ne 0) {

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

0 commit comments

Comments
 (0)