Skip to content

Commit 825fde2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13843)
[main] Source code updates from dotnet/dotnet
1 parent e84c0ec commit 825fde2

File tree

10 files changed

+110
-85
lines changed

10 files changed

+110
-85
lines changed

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22

3-
<Import Project="$(RepositoryEngineeringDir)Analyzer.targets" />
3+
<Import Project="$(RepositoryEngineeringDir)Analyzer.targets" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
44
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
55
<Import Project="$(RepositoryEngineeringDir)packageContent.targets" />
66
<Import Project="$(RepositoryEngineeringDir)versioning.targets" />

‎build.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
source="${BASH_SOURCE[0]}"
4+
5+
# resolve $SOURCE until the file is no longer a symlink
6+
while [[ -h $source ]]; do
7+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
8+
source="$(readlink "$source")"
9+
10+
# if $source was a relative symlink, we need to resolve it relative to the path where the
11+
# symlink file was located
12+
[[ $source != /* ]] && source="$scriptroot/$source"
13+
done
14+
15+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
16+
"$scriptroot/eng/common/build.sh" --restore --build $@

‎eng/Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<!-- Only build the Microsoft.Private.Winforms package on non-Windows. -->
4+
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">
5+
<ProjectToBuild Include="$(RepoRoot)pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj" />
6+
<ProjectToBuild Include="$(RepoRoot)pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/Microsoft.Dotnet.Winforms.ProjectTemplates.csproj" />
7+
</ItemGroup>
8+
9+
</Project>

‎eng/Version.Details.props‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!--
32
This file is auto-generated by the Maestro dependency flow system.
43
Do not edit it manually, as it will get overwritten by automation.
@@ -7,30 +6,30 @@ This file should be imported by eng/Versions.props
76
<Project>
87
<PropertyGroup>
98
<!-- dotnet/dotnet dependencies -->
10-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetArcadeSdkPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCorePlatformsPackageVersion>
21-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.1.25420.121</MicrosoftWin32SystemEventsPackageVersion>
22-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25420.121</SystemCodeDomPackageVersion>
25-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25420.121</SystemConfigurationConfigurationManagerPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25420.121</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>10.0.0-rc.1.25420.121</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25420.121</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25420.121</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25420.121</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25420.121</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>10.0.0-rc.1.25420.121</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25420.121</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetCMakeSdkPackageVersion>
11+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetGenFacadesPackageVersion>
12+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetHelixSdkPackageVersion>
13+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetRemoteExecutorPackageVersion>
14+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25453.110</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
15+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETSdkILPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETCoreILAsmPackageVersion>
18+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETCoreILDAsmPackageVersion>
19+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25453.110</MicrosoftNETCorePlatformsPackageVersion>
20+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.1.25453.110</MicrosoftWin32SystemEventsPackageVersion>
21+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25453.110</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
22+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25453.110</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
23+
<SystemCodeDomPackageVersion>10.0.0-rc.1.25453.110</SystemCodeDomPackageVersion>
24+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25453.110</SystemConfigurationConfigurationManagerPackageVersion>
25+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25453.110</SystemFormatsNrbfPackageVersion>
26+
<SystemIOHashingPackageVersion>10.0.0-rc.1.25453.110</SystemIOHashingPackageVersion>
27+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25453.110</SystemReflectionMetadataLoadContextPackageVersion>
28+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25453.110</SystemResourcesExtensionsPackageVersion>
29+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25453.110</SystemRuntimeSerializationFormattersPackageVersion>
30+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25453.110</SystemTextEncodingsWebPackageVersion>
31+
<SystemTextJsonPackageVersion>10.0.0-rc.1.25453.110</SystemTextJsonPackageVersion>
32+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25453.110</SystemWindowsExtensionsPackageVersion>
3433
</PropertyGroup>
3534
<!--Property group for alternate package version names-->
3635
<PropertyGroup>

‎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="c4dc56079d959dbdb7fc27ea8ad7f95194885923" BarId="280214" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="3e92251978ce669b493f159048932e690306a3bf" BarId="281912" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25420.121">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25453.110">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
13+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25420.121">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25453.110">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
17+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25420.121">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25453.110">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
21+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.1.25420.121">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.1.25453.110">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
25+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25420.121">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25453.110">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
29+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25420.121">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25453.110">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
33+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25420.121">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25453.110">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
37+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25420.121">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25453.110">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
41+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25420.121">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25453.110">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
45+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25420.121">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25453.110">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
49+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25420.121">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25453.110">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
53+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25420.121">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25453.110">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
57+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25420.121">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25453.110">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
61+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.1.25420.121">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.1.25453.110">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
65+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25420.121">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25453.110">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
69+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25420.121">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25453.110">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
73+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25420.121">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25453.110">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
77+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.1.25420.121">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.1.25453.110">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
81+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.121">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25453.110">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
88+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25420.121">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25453.110">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
92+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25420.121">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25453.110">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
96+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.121">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25453.110">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
100+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25420.121">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25453.110">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
104+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25420.121">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25453.110">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
108+
<Sha>3e92251978ce669b493f159048932e690306a3bf</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/common/core-templates/steps/generate-sbom.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
66

77
parameters:
8-
PackageVersion: 10.0.0
8+
PackageVersion: 11.0.0
99
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
1010
PackageName: '.NET'
1111
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom

‎eng/common/sdk-task.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13-
echo " --noWarnAsError Do not warn as error
13+
echo " --noWarnAsError Do not warn as error"
1414
echo ""
1515
echo "Command line arguments not listed above are passed thru to msbuild."
1616
}

‎global.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25411.109",
3+
"version": "10.0.100-rc.1.25420.111",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,7 +10,7 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-rc.1.25411.109",
13+
"dotnet": "10.0.100-rc.1.25420.111",
1414
"runtimes": {
1515
"dotnet/x64": [
1616
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,11 +21,11 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121",
25-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25420.121",
26-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121",
24+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25453.110",
25+
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25453.110",
26+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25453.110",
2727
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
28-
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25420.121"
28+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25453.110"
2929
},
3030
"native-tools": {
3131
"cmake": "latest"

‎pkg/Microsoft.Private.Winforms/Directory.Build.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
-->
1717
<Target Name="UpdateTransportPackage"
1818
AfterTargets="GenerateNuspec"
19-
DependsOnTargets="GenerateNuspec">
19+
DependsOnTargets="GenerateNuspec"
20+
Condition="'$(OS)' == 'Windows_NT'">
2021
<ItemGroup>
2122
<_NuspecFile Include="@(NuGetPackOutput)" Condition="'%(Extension)' == '.nuspec'" />
2223
</ItemGroup>

‎pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<!-- Any projects referenced here will have their outputs automatically put into the package -->
6868
<!-- If you add a new csproj, and you want the outputs in the package, you must add it here -->
69-
<ItemGroup>
69+
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
7070
<!-- Facade for System.Drawing -->
7171
<ProjectReference Include="..\..\src\System.Drawing\src\System.Drawing.Facade.csproj" />
7272

0 commit comments

Comments
 (0)