8000 [main] Source code updates from dotnet/dotnet (#13531) · dotnet/winforms@bedb989 · GitHub
[go: up one dir, main page]
Skip to content

Commi 8000 t bedb989

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13531)
[main] Source code updates from dotnet/dotnet
1 parent 9db17fd commit bedb989

File tree

6 files changed

+75
-78
lines changed

6 files changed

+75
-78
lines changed

‎eng/Version.Details.xml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="0a01b394b186e190a80cb55740c13f6293cf5446" BarId="269884" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25276.103">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25278.103">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
13+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25276.103">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25278.103">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
17+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25276.103">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25278.103">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
21+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25276.103">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25278.103">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
25+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25278.103">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
29+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25278.103">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
33+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25278.103">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
37+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25276.103">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25278.103">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
41+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25276.103">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25278.103">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
45+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25276.103">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25278.103">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
49+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25276.103">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25278.103">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
53+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25276.103">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25278.103">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
57+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25276.103">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25278.103">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
61+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25276.103">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25278.103">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
65+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25276.103">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25278.103">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
69+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25276.103">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25278.103">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
73+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25276.103">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25278.103">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
77+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25276.103">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25278.103">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
81+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25276.103">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25278.103">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
88+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25276.103">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25278.103">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
92+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25276.103">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25278.103">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
96+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25276.103">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25278.103">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
100+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25276.103">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25278.103">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
104+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25276.103">
106+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25278.103">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
108+
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
F438
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1111
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1212
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
13-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25276.103</SystemReflectionMetadataLoadContextVersion>
14-
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25276.103</SystemTextEncodingsWebVersion>
13+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25278.103</SystemReflectionMetadataLoadContextVersion>
14+
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25278.103</SystemTextEncodingsWebVersion>
1515
</PropertyGroup>
1616
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1717
<PropertyGroup>
18-
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25276.103</SystemFormatsNrbfPackageVersion>
19-
<SystemIOHashingPackageVersion>10.0.0-preview.6.25276.103</SystemIOHashingPackageVersion>
18+
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25278.103</SystemFormatsNrbfPackageVersion>
19+
<SystemIOHashingPackageVersion>10.0.0-preview.6.25278.103</SystemIOHashingPackageVersion>
2020
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
21-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreILDAsmPackageVersion>
21+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25278.103</MicrosoftNETCoreILDAsmPackageVersion>
2222
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
23-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25276.103</SystemRuntimeSerializationFormattersPackageVersion>
24-
<SystemTextJsonPackageVersion>10.0.0-preview.6.25276.103</SystemTextJsonPackageVersion>
25-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreAppRefPackageVersion>
26-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCorePlatformsPackageVersion>
27-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25276.103</MicrosoftWin32SystemEventsPackageVersion>
28-
<SystemCodeDomPackageVersion>10.0.0-preview.6.25276.103</SystemCodeDomPackageVersion>
29-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25276.103</SystemConfigurationConfigurationManagerPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25276.103</SystemResourcesExtensionsPackageVersion>
23+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25278.103</SystemRuntimeSerializationFormattersPackageVersion>
24+
<SystemTextJsonPackageVersion>10.0.0-preview.6.25278.103</SystemTextJsonPackageVersion>
25+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25278.103</MicrosoftNETCoreAppRefPackageVersion>
26+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25278.103</MicrosoftNETCorePlatformsPackageVersion>
27+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25278.103</MicrosoftWin32SystemEventsPackageVersion>
28+
<SystemCodeDomPackageVersion>10.0.0-preview.6.25278.103</SystemCodeDomPackageVersion>
29+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25278.103</SystemConfigurationConfigurationManagerPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25278.103</SystemResourcesExtensionsPackageVersion>
3131
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25276.103</SystemWindowsExtensionsPackageVersion>
33-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreILAsmPackageVersion>
34-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25276.103</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25276.103</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36-
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25276.103</MicrosoftNETSdkILVersion>
32+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25278.103</SystemWindowsExtensionsPackageVersion>
33+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25278.103</MicrosoftNETCoreILAsmPackageVersion>
34+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25278.103</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25278.103</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36+
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25278.103</MicrosoftNETSdkILVersion>
3737
<!--
3838
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
3939
-->
@@ -46,9 +46,9 @@
4646
</PropertyGroup>
4747
<!-- Arcade -->
4848
<PropertyGroup>
49-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetGenFacadesPackageVersion>
50-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25276.103</MicrosoftDotNetRemoteExecutorVersion>
51-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetXUnitExtensionsPackageVersion>
49+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25278.103</MicrosoftDotNetGenFacadesPackageVersion>
50+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25278.103</MicrosoftDotNetRemoteExecutorVersion>
51+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25278.103</MicrosoftDotNetXUnitExtensionsPackageVersion>
5252
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5353
</PropertyGroup>
5454
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ function Build {
257257
/p:Sign=$sign \
258258
/p:Publish=$publish \
259259
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
260-
"${properties[@]}"
260+
${properties[@]+"${properties[@]}"}
261261

262262
ExitWithExitCode 0
263263
}

‎eng/common/tools.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ function GetNuGetPackageCachePath() {
644644
$env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
645645
} else {
646646
$env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
647-
$env:RESTORENOHTTPCACHE = $true
648647
}
649648
}
650649

‎eng/common/tools.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,12 @@ function InitializeBuildTool {
345345
_InitializeBuildToolCommand="msbuild"
346346
}
347347

348-
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
349348
function GetNuGetPackageCachePath {
350349
if [[ -z ${NUGET_PACKAGES:-} ]]; then
351350
if [[ "$use_global_nuget_cache" == true ]]; then
352351
export NUGET_PACKAGES="$HOME/.nuget/packages/"
353352
else
354353
export NUGET_PACKAGES="$repo_root/.packages/"
355-
export RESTORENOHTTPCACHE=true
356354
fi
357355
fi
358356

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"version": "10.0.100-preview.6.25272.112"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25276.103",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25276.103",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25276.103",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25278.103",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25278.103",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25278.103",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25276.103"
21+
"Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25278.103"
2222
},
2323
"native-tools": {
2424
"cmake": "latest"

0 commit comments

Comments
 (0)
0