Skip to content

Commit 7e60d3a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/dotnet build 272389
Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, System.Drawing.Common (Version 10.0.0-preview.6.25318.104 -> 10.0.0-preview.6.25318.105) System.Reflection.MetadataLoadContext, System.Windows.Extensions, Microsoft.NETCore.Platforms, System.Resources.Extensions, System.Runtime.Serialization.Formatters, Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Formats.Nrbf, System.IO.Packaging, System.Security.Cryptography.Xml, System.Security.Permissions (Version 10.0.0-preview.7.25318.104 -> 10.0.0-preview.7.25318.105) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub (Version 10.0.0-beta.25318.104 -> 10.0.0-beta.25318.105)
1 parent 10e78fa commit 7e60d3a

File tree

4 files changed

+70
-76
lines changed

4 files changed

+70
-76
lines changed

‎eng/Version.Details.xml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="9bcfe617e4f615d6931e2eec47767c3f15116d1d" BarId="272322" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="10060d128e3f470e77265f8490f5e4f72dae738e" BarId="272389" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25318.104">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25318.105">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
7+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25318.104">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25318.105">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
11+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25318.104">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25318.105">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
15+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25318.104">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25318.105">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
19+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25318.104">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25318.105">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
23+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.6.25280.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>5a079d0b04213669793487f309e2d0eb1d146d25</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25318.104">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25318.105">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
31+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25318.104">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25318.105">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
35+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25318.104">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25318.105">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
39+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25318.104">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25318.105">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
43+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25318.104">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25318.105">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
47+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.7.25318.104">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.7.25318.105">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
51+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.7.25318.104">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.7.25318.105">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
55+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25318.104">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25318.105">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
59+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.7.25318.104">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.7.25318.105">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
63+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.7.25318.104">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.7.25318.105">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
67+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.7.25318.104">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.7.25318.105">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
71+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25318.104">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25318.105">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
75+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25318.104">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25318.105">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
81+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25318.104">
83+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25318.105">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
85+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25318.104">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25318.105">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
89+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25318.104">
91+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25318.105">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
93+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25318.104">
95+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25318.105">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
97+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25318.104">
99+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25318.105">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
101+
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
102102
</Dependency>
103103
</ToolsetDependencies>
104104
</Dependencies>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,33 @@
1919
dotnet/winforms is handling versions for the analyzers.
2020
-->
2121
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
22-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25318.104</MicrosoftDotNetCodeAnalysisVersion>
23-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25318.104</MicrosoftSourceLinkAzureReposGitVersion>
24-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25318.104</MicrosoftSourceLinkGitHubVersion>
22+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25318.105</MicrosoftDotNetCodeAnalysisVersion>
23+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25318.105</MicrosoftSourceLinkAzureReposGitVersion>
24+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25318.105</MicrosoftSourceLinkGitHubVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/winforms -->
2727
<PropertyGroup>
28-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25318.104</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25318.104</MicrosoftPrivateWinformsVersion>
30-
<SystemDrawingCommonVersion>10.0.0-preview.6.25318.104</SystemDrawingCommonVersion>
28+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25318.105</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25318.105</MicrosoftPrivateWinformsVersion>
30+
<SystemDrawingCommonVersion>10.0.0-preview.6.25318.105</SystemDrawingCommonVersion>
3131
</PropertyGroup>
3232
<!-- Packages that come from https://github.com/dotnet/runtime -->
3333
<PropertyGroup>
34-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25318.104</MicrosoftNETCoreAppRefVersion>
35-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25318.104</MicrosoftNETCorePlatformsVersion>
36-
<SystemCodeDomPackageVersion>10.0.0-preview.7.25318.104</SystemCodeDomPackageVersion>
37-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25318.104</SystemConfigurationConfigurationManagerPackageVersion>
38-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.7.25318.104</SystemDiagnosticsEventLogPackageVersion>
39-
<SystemDirectoryServicesVersion>10.0.0-preview.7.25318.104</SystemDirectoryServicesVersion>
40-
<SystemFormatsNrbfVersion>10.0.0-preview.7.25318.104</SystemFormatsNrbfVersion>
41-
<SystemIOPackagingVersion>10.0.0-preview.7.25318.104</SystemIOPackagingVersion>
42-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25318.104</SystemReflectionMetadataLoadContextVersion>
34+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25318.105</MicrosoftNETCoreAppRefVersion>
35+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25318.105</MicrosoftNETCorePlatformsVersion>
36+
<SystemCodeDomPackageVersion>10.0.0-preview.7.25318.105</SystemCodeDomPackageVersion>
37+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25318.105</SystemConfigurationConfigurationManagerPackageVersion>
38+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.7.25318.105</SystemDiagnosticsEventLogPackageVersion>
39+
<SystemDirectoryServicesVersion>10.0.0-preview.7.25318.105</SystemDirectoryServicesVersion>
40+
<SystemFormatsNrbfVersion>10.0.0-preview.7.25318.105</SystemFormatsNrbfVersion>
41+
<SystemIOPackagingVersion>10.0.0-preview.7.25318.105</SystemIOPackagingVersion>
42+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25318.105</SystemReflectionMetadataLoadContextVersion>
4343
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
44-
<SystemResourcesExtensionsVersion>10.0.0-preview.7.25318.104</SystemResourcesExtensionsVersion>
45-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25318.104</SystemRuntimeSerializationFormattersPackageVersion>
46-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.7.25318.104</SystemSecurityCryptographyXmlPackageVersion>
47-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.7.25318.104</SystemSecurityPermissionsPackageVersion>
48-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25318.104</SystemWindowsExtensionsPackageVersion>
44+
<SystemResourcesExtensionsVersion>10.0.0-preview.7.25318.105</SystemResourcesExtensionsVersion>
45+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25318.105</SystemRuntimeSerializationFormattersPackageVersion>
46+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.7.25318.105</SystemSecurityCryptographyXmlPackageVersion>
47+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.7.25318.105</SystemSecurityPermissionsPackageVersion>
48+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25318.105</SystemWindowsExtensionsPackageVersion>
4949
</PropertyGroup>
5050
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
5151
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
@@ -59,7 +59,7 @@
5959
<!-- Packages that come from https://github.com/dotnet/arcade -->
6060
<PropertyGroup>
6161
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
62-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25318.104</MicrosoftDotNetGenAPIVersion>
62+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25318.105</MicrosoftDotNetGenAPIVersion>
6363
</PropertyGroup>
6464
<!-- Sourcelink -->
6565
<PropertyGroup>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
41-
baseRidArgs=
42-
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43-
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
44-
fi
45-
4641
portableBuildArgs=
4742
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
4843
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
5550
${{ parameters.platform.buildArguments }} \
5651
$internalRuntimeDownloadArgs \
5752
$targetRidArgs \
58-
$baseRidArgs \
5953
$portableBuildArgs \
6054
displayName: Build
6155

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25318.104",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25318.104",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25318.105",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25318.105",
1919
"Microsoft.Build.NoTargets": "3.7.56"
2020
},
2121
"sdk": {

0 commit comments

Comments
 (0)