Skip to content

Commit b6316f1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#10930)
* Update dependencies from https://github.com/dotnet/dotnet build 271343 Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, 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, System.Drawing.Common (Version 10.0.0-preview.6.25310.107 -> 10.0.0-preview.6.25311.102) 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.25310.107 -> 10.0.0-beta.25311.102) * Update dependencies from https://github.com/dotnet/dotnet build 271417 Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, 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, System.Drawing.Common (Version 10.0.0-preview.6.25311.102 -> 10.0.0-preview.6.25311.107) 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.25311.102 -> 10.0.0-beta.25311.107) * Update dependencies from https://github.com/dotnet/dotnet build 271708 Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, 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, System.Drawing.Common (Version 10.0.0-preview.6.25311.107 -> 10.0.0-preview.6.25313.102) 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.25311.107 -> 10.0.0-beta.25313.102) * Update dependencies from https://github.com/dotnet/dotnet build 271805 Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, 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, System.Drawing.Common (Version 10.0.0-preview.6.25313.102 -> 10.0.0-preview.6.25314.101) 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.25313.102 -> 10.0.0-beta.25314.101) * Update dependencies from https://github.com/dotnet/dotnet build 271836 Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, 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, System.Drawing.Common (Version 10.0.0-preview.6.25314.101 -> 10.0.0-preview.6.25315.102) 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.25314.101 -> 10.0.0-beta.25315.102) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b4d57bf commit b6316f1

File tree

11 files changed

+128
-122
lines changed

11 files changed

+128
-122
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="604a6612d130bc042dc973aba84889f529f9cb69" BarId="271181" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25310.107">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25315.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
7+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25310.107">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25315.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
11+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25310.107">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25315.102">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
15+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25310.107">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25315.102">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
19+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25310.107">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25315.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
23+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</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.6.25310.107">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25315.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
31+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25310.107">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25315.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
35+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25310.107">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25315.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
39+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25310.107">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25315.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
43+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25310.107">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25315.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
47+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25310.107">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25315.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
51+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25310.107">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25315.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
55+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25310.107">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25315.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
59+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25310.107">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25315.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
63+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25310.107">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25315.102">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
67+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25310.107">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25315.102">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
71+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25310.107">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25315.102">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
75+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25310.107">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
81+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25310.107">
83+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25315.102">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
85+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25310.107">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25315.102">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
89+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25310.107">
91+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25315.102">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
93+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25310.107">
95+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25315.102">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
97+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25310.107">
99+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25315.102">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>604a6612d130bc042dc973aba84889f529f9cb69</Sha>
101+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</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.25310.107</MicrosoftDotNetCodeAnalysisVersion>
23-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25310.107</MicrosoftSourceLinkAzureReposGitVersion>
24-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25310.107</MicrosoftSourceLinkGitHubVersion>
22+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25315.102</MicrosoftDotNetCodeAnalysisVersion>
23+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25315.102</MicrosoftSourceLinkAzureReposGitVersion>
24+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25315.102</MicrosoftSourceLinkGitHubVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/winforms -->
2727
<PropertyGroup>
28-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25310.107</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25310.107</MicrosoftPrivateWinformsVersion>
30-
<SystemDrawingCommonVersion>10.0.0-preview.6.25310.107</SystemDrawingCommonVersion>
28+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25315.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25315.102</MicrosoftPrivateWinformsVersion>
30+
<SystemDrawingCommonVersion>10.0.0-preview.6.25315.102</SystemDrawingCommonVersion>
3131
</PropertyGroup>
3232
<!-- Packages that come from https://github.com/dotnet/runtime -->
3333
<PropertyGroup>
34-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25310.107</MicrosoftNETCoreAppRefVersion>
35-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25310.107</MicrosoftNETCorePlatformsVersion>
36-
<SystemCodeDomPackageVersion>10.0.0-preview.6.25310.107</SystemCodeDomPackageVersion>
37-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25310.107</SystemConfigurationConfigurationManagerPackageVersion>
38-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25310.107</SystemDiagnosticsEventLogPackageVersion>
39-
<SystemDirectoryServicesVersion>10.0.0-preview.6.25310.107</SystemDirectoryServicesVersion>
40-
<SystemFormatsNrbfVersion>10.0.0-preview.6.25310.107</SystemFormatsNrbfVersion>
41-
<SystemIOPackagingVersion>10.0.0-preview.6.25310.107</SystemIOPackagingVersion>
42-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25310.107</SystemReflectionMetadataLoadContextVersion>
34+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25315.102</MicrosoftNETCoreAppRefVersion>
35+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25315.102</MicrosoftNETCorePlatformsVersion>
36+
<SystemCodeDomPackageVersion>10.0.0-preview.6.25315.102</SystemCodeDomPackageVersion>
37+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25315.102</SystemConfigurationConfigurationManagerPackageVersion>
38+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25315.102</SystemDiagnosticsEventLogPackageVersion>
39+
<SystemDirectoryServicesVersion>10.0.0-preview.6.25315.102</SystemDirectoryServicesVersion>
40+
<SystemFormatsNrbfVersion>10.0.0-preview.6.25315.102</SystemFormatsNrbfVersion>
41+
<SystemIOPackagingVersion>10.0.0-preview.6.25315.102</SystemIOPackagingVersion>
42+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25315.102</SystemReflectionMetadataLoadContextVersion>
4343
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
44-
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25310.107</SystemResourcesExtensionsVersion>
45-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25310.107</SystemRuntimeSerializationFormattersPackageVersion>
46-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25310.107</SystemSecurityCryptographyXmlPackageVersion>
47-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25310.107</SystemSecurityPermissionsPackageVersion>
48-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25310.107</SystemWindowsExtensionsPackageVersion>
44+
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25315.102</SystemResourcesExtensionsVersion>
45+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25315.102</SystemRuntimeSerializationFormattersPackageVersion>
46+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25315.102</SystemSecurityCryptographyXmlPackageVersion>
47+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25315.102</SystemSecurityPermissionsPackageVersion>
48+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25315.102</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.25310.107</MicrosoftDotNetGenAPIVersion>
62+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25315.102</MicrosoftDotNetGenAPIVersion>
6363
</PropertyGroup>
6464
<!-- Sourcelink -->
6565
<PropertyGroup>

‎eng/common/core-templates/steps/source-index-stage1-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
parameters:
22
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

77
steps:
88
- task: UseDotNet@2
9-
displayName: "Source Index: Use .NET 8 SDK"
9+
displayName: "Source Index: Use .NET 9 SDK"
1010
inputs:
1111
packageType: sdk
12-
version: 8.0.x
12+
version: 9.0.x
1313
installationPath: $(Agent.TempDirectory)/dotnet
1414
workingDirectory: $(Agent.TempDirectory)
1515

‎eng/common/cross/build-rootfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ while :; do
295295
;;
296296
noble) # Ubuntu 24.04
297297
__CodeName=noble
298-
if [[ -n "$__LLDB_Package" ]]; then
299-
__LLDB_Package="liblldb-18-dev"
298+
if [[ -z "$__LLDB_Package" ]]; then
299+
__LLDB_Package="liblldb-19-dev"
300300
fi
301301
;;
302302
stretch) # Debian 9

‎eng/common/dotnet.cmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
3+
:: This script is used to install the .NET SDK.
4+
:: It will also invoke the SDK with any provided arguments.
5+
6+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
7+
exit /b %ErrorLevel%

‎eng/common/dotnet.ps1

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This script is used to install the .NET SDK.
2+
# It will also invoke the SDK with any provided arguments.
3+
4+
. $PSScriptRoot\tools.ps1
5+
$dotnetRoot = InitializeDotNetCli -install:$true
6+
7+
# Invoke acquired SDK with args if they are provided
8+
if ($args.count -gt 0) {
9+
$env:DOTNET_NOLOGO=1
10+
& "$dotnetRoot\dotnet.exe" $args
11+
}

‎eng/common/dotnet.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
3+
# This script is used to install the .NET SDK.
4+
# It will also invoke the SDK with any provided arguments.
5+
6+
source="${BASH_SOURCE[0]}"
7+
# resolve $SOURCE until the file is no longer a symlink
8+
while [[ -h $source ]]; do
9+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
10+
source="$(readlink "$source")"
11+
12+
# if $source was a relative symlink, we need to resolve it relative to the path where the
13+
# symlink file was located
14+
[[ $source != /* ]] && source="$scriptroot/$source"
15+
done
16+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
17+
18+
source $scriptroot/tools.sh
19+
InitializeDotNetCli true # install
20+
21+
# Invoke acquired SDK with args if they are provided
22+
if [[ $# > 0 ]]; then
23+
__dotnetDir=${_InitializeDotNetCli}
24+
dotnetPath=${__dotnetDir}/dotnet
25+
${dotnetPath} "$@"
26+
fi

‎eng/common/templates/vmr-build-pr.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
trigger: none
2-
pr:
3-
branches:
4-
include:
5-
- main
6-
- release/*
7-
paths:
8-
exclude:
9-
- documentation/*
10-
- README.md
11-
- CODEOWNERS
2+
pr: none
123

134
variables:
145
- template: /eng/common/templates/variables/pool-providers.yml@self

‎eng/common/tools.ps1

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -765,28 +765,13 @@ function MSBuild() {
765765

766766
$toolsetBuildProject = InitializeToolset
767767
$basePath = Split-Path -parent $toolsetBuildProject
768-
$possiblePaths = @(
769-
# new scripts need to work with old packages, so we need to look for the old names/versions
770-
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
771-
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
772-
773-
# This list doesn't need to be updated anymore and can eventually be removed.
774-
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
775-
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
776-
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
777-
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
778-
)
779-
$selectedPath = $null
780-
foreach ($path in $possiblePaths) {
781-
if (Test-Path $path -PathType Leaf) {
782-
$selectedPath = $path
783-
break
784-
}
785-
}
768+
$selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
769+
786770
if (-not $selectedPath) {
787-
Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
771+
Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
788772
ExitWithExitCode 1
789773
}
774+
790775
$args += "/logger:$selectedPath"
791776
}
792777

‎eng/common/tools.sh

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -447,27 +447,13 @@ function MSBuild {
447447
fi
448448

449449
local toolset_dir="${_InitializeToolset%/*}"
450-
# new scripts need to work with old packages, so we need to look for the old names/versions
451-
local selectedPath=
452-
local possiblePaths=()
453-
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" )
454-
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" )
455-
456-
# This list doesn't need to be updated anymore and can eventually be removed.
457-
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" )
458-
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" )
459-
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
460-
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
461-
for path in "${possiblePaths[@]}"; do
462-
if [[ -f $path ]]; then
463-
selectedPath=$path
464-
break
465-
fi
466-
done
450+
local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll"
451+
467452
if [[ -z "$selectedPath" ]]; then
468-
Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly."
453+
Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly: $selectedPath"
469454
ExitWithExitCode 1
470455
fi
456+
471457
args+=( "-logger:$selectedPath" )
472458
fi
473459

0 commit comments

Comments
 (0)