Skip to content

Commit 4a2e721

Browse files
rmarinhormarinho
authored
[main] Make main net9 (#25351)
### Description of Change Merge net9 to main
2 parents c177617 + e25c494 commit 4a2e721

File tree

1,476 files changed

+51812
-13805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,476 files changed

+51812
-13805
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"microsoft.dotnet.xharness.cli": {
24-
"version": "10.0.0-prerelease.24511.1",
24+
"version": "9.0.0-prerelease.24510.3",
2525
"commands": [
2626
"xharness"
2727
]

‎.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
# Blazor Desktop
99
/src/BlazorWebView/ @dotnet/dotnet-maui-blazor-eng
1010
/src/Templates/src/templates/maui-blazor/ @dotnet/dotnet-maui-blazor-eng
11+
/src/Templates/src/templates/maui-blazor-solution/ @dotnet/dotnet-maui-blazor-eng

‎.github/dependabot.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ updates:
4141
- "Microsoft.Graphics.Win2D"
4242
- "Microsoft.Windows.SDK.BuildTools"
4343
- "Microsoft.WindowsAppSDK"
44+
- "Microsoft.Web.WebView2"
4445
xunit:
4546
patterns:
4647
- "xunit"
@@ -57,7 +58,7 @@ updates:
5758
- dependency-name: "Newtonsoft.Json" # needs to be done manually to match VS
5859
- dependency-name: "Microsoft.Build*" # these packages neet to be kept on old version that supports netstandard2.0
5960
- dependency-name: "Selenium.*" # needs to be done manually because other packages need to be compiled with these new versions
60-
61+
6162
labels:
6263
- "nuget"
6364
- "dependencies"

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,3 +376,9 @@ Directory.Build.Override.props
376376

377377
# Only the "snapshots" directory should be added to Git, not the "snapshots-diff" directory
378378
snapshots-diff/
379+
380+
#install of dotnet version
381+
/.dotnet
382+
.dotnet
383+
temp
384+
.packages

‎Directory.Build.props

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
33
<Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="$(MSBuildThisFileDirectory)eng\Environment.Build.props" />
44

5-
<PropertyGroup>
5+
<PropertyGroup>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<DebugType>portable</DebugType>
88
<DebugSymbols>true</DebugSymbols>
@@ -11,6 +11,9 @@
1111
<SignAssembly>false</SignAssembly>
1212
<MauiRootDirectory>$(MSBuildThisFileDirectory)</MauiRootDirectory>
1313
<MauiSrcDirectory>$(MSBuildThisFileDirectory)src/</MauiSrcDirectory>
14+
<IncludePreviousTfms>false</IncludePreviousTfms>
15+
<IncludePreviousTfmsEssentials>false</IncludePreviousTfmsEssentials>
16+
<IncludePreviousTfmsGraphics>false</IncludePreviousTfmsGraphics>
1417
</PropertyGroup>
1518

1619
<PropertyGroup>
@@ -40,14 +43,14 @@
4043
<NuGetAuditMode>all</NuGetAuditMode>
4144
<NuGetAuditLevel>moderate</NuGetAuditLevel>
4245
</PropertyGroup>
43-
46+
4447
<PropertyGroup>
45-
<_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">8</_MauiDotNetVersionMajor>
48+
<_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">9</_MauiDotNetVersionMajor>
4649
<_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0</_MauiDotNetVersionMinor>
4750
<_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
4851
<_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>
49-
50-
<_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">7</_MauiPreviousDotNetVersionMajor>
52+
53+
<_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">8</_MauiPreviousDotNetVersionMajor>
5154
<_MauiPreviousDotNetVersionMinor Condition="'$(_MauiPreviousDotNetVersionMinor)' == ''">0</_MauiPreviousDotNetVersionMinor>
5255
<_MauiPreviousDotNetVersion Condition="'$(_MauiPreviousDotNetVersion)' == ''">$(_MauiPreviousDotNetVersionMajor).$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersion>
5356
<_MauiPreviousDotNetVersionNoDot Condition="'$(_MauiPreviousDotNetVersionNoDot)' == ''">$(_MauiPreviousDotNetVersionMajor)$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersionNoDot>
@@ -104,6 +107,7 @@
104107
<!-- this is CI, so everything should be there -->
105108
<PropertyGroup Condition="'$(CI)' == 'true' or '$(TF_BUILD)' == 'true'">
106109
<IncludeWindowsTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">true</IncludeWindowsTargetFrameworks>
110+
<!-- Disabled until net9.0-tizen is available -->
107111
<IncludeTizenTargetFrameworks>true</IncludeTizenTargetFrameworks>
108112
<IncludeMacOSTargetFrameworks>true</IncludeMacOSTargetFrameworks>
109113
<IncludeAndroidTargetFrameworks>true</IncludeAndroidTargetFrameworks>
@@ -114,37 +118,43 @@
114118
<PropertyGroup>
115119
<DefineConstants Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">$(DefineConstants);WINDOWS</DefineConstants>
116120
<DefineConstants Condition="'$(IncludeCompatibilityProjects)' == 'True'">$(DefineConstants);COMPATIBILITY_ENABLED</DefineConstants>
117-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
121+
<DefineConstants Condition="'$(IncludePreviousTfms)' == 'True'">$(DefineConstants);ENABLE_PREVIOUS_TFM_BUILDS</DefineConstants>
122+
<!-- <SymbolPackageFormat>snupkg</SymbolPackageFormat> -->
118123
<!-- <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> -->
119124
<!-- HACK: WinUI seems to have issues without this -->
120125
<GenerateLibraryLayout>true</GenerateLibraryLayout>
121126
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
122127
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
123128
</PropertyGroup>
124129

130+
<!-- Windows specific settings -->
131+
<PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
132+
<WindowsSdkPackageVersion>10.0.19041.44</WindowsSdkPackageVersion>
133+
</PropertyGroup>
134+
125135
<!-- version number information -->
126136
<PropertyGroup>
127137
<!-- Default versions from the SDKs (update when there is a new TFM version) -->
128-
<IosTargetFrameworkVersionSdkDefault>17.5</IosTargetFrameworkVersionSdkDefault>
129-
<TvosTargetFrameworkVersionSdkDefault>17.5</TvosTargetFrameworkVersionSdkDefault>
130-
<MacCatalystTargetFrameworkVersionSdkDefault>17.5</MacCatalystTargetFrameworkVersionSdkDefault>
131-
<MacosTargetFrameworkVersionSdkDefault>14.5</MacosTargetFrameworkVersionSdkDefault>
132-
<AndroidTargetFrameworkVersionSdkDefault>34.0</AndroidTargetFrameworkVersionSdkDefault>
138+
<IosTargetFrameworkVersionSdkDefault>18.0</IosTargetFrameworkVersionSdkDefault>
139+
<TvosTargetFrameworkVersionSdkDefault>18.0</TvosTargetFrameworkVersionSdkDefault>
140+
<MacCatalystTargetFrameworkVersionSdkDefault>18.0</MacCatalystTargetFrameworkVersionSdkDefault>
141+
<MacosTargetFrameworkVersionSdkDefault>15.0</MacosTargetFrameworkVersionSdkDefault>
142+
<AndroidTargetFrameworkVersionSdkDefault>35.0</AndroidTargetFrameworkVersionSdkDefault>
133143
<!-- Current .NET -->
134-
<IosTargetFrameworkVersion>17.0</IosTargetFrameworkVersion>
135-
<TvosTargetFrameworkVersion>17.0</TvosTargetFrameworkVersion>
136-
<MacCatalystTargetFrameworkVersion>17.0</MacCatalystTargetFrameworkVersion>
137-
<MacosTargetFrameworkVersion>14.0</MacosTargetFrameworkVersion>
138-
<AndroidTargetFrameworkVersion>34.0</AndroidTargetFrameworkVersion>
144+
<IosTargetFrameworkVersion>18.0</IosTargetFrameworkVersion>
145+
<TvosTargetFrameworkVersion>18.0</TvosTargetFrameworkVersion>
146+
<MacCatalystTargetFrameworkVersion>18.0</MacCatalystTargetFrameworkVersion>
147+
<MacosTargetFrameworkVersion>15.0</MacosTargetFrameworkVersion>
148+
<AndroidTargetFrameworkVersion>35.0</AndroidTargetFrameworkVersion>
139149
<WindowsTargetFrameworkVersion>10.0.19041.0</WindowsTargetFrameworkVersion>
140150
<Windows2TargetFrameworkVersion>10.0.20348.0</Windows2TargetFrameworkVersion>
141151
<TizenTargetFrameworkVersion>7.0</TizenTargetFrameworkVersion>
142152
<!-- Previous .NET -->
143-
<IosPreviousTargetFrameworkVersion>16.1</IosPreviousTargetFrameworkVersion>
144-
<TvosPreviousTargetFrameworkVersion>16.1</TvosPreviousTargetFrameworkVersion>
145-
<MacCatalystPreviousTargetFrameworkVersion>16.1</MacCatalystPreviousTargetFrameworkVersion>
146-
<MacosPreviousTargetFrameworkVersion>13.0</MacosPreviousTargetFrameworkVersion>
147-
<AndroidPreviousTargetFrameworkVersion>33.0</AndroidPreviousTargetFrameworkVersion>
153+
<IosPreviousTargetFrameworkVersion>17.5</IosPreviousTargetFrameworkVersion>
154+
<TvosPreviousTargetFrameworkVersion>17.5</TvosPreviousTargetFrameworkVersion>
155+
<MacCatalystPreviousTargetFrameworkVersion>17.5</MacCatalystPreviousTargetFrameworkVersion>
156+
<MacosPreviousTargetFrameworkVersion>14.5</MacosPreviousTargetFrameworkVersion>
157+
<AndroidPreviousTargetFrameworkVersion>35.0</AndroidPreviousTargetFrameworkVersion>
148158
<WindowsPreviousTargetFrameworkVersion>10.0.19041.0</WindowsPreviousTargetFrameworkVersion>
149159
<Windows2PreviousTargetFrameworkVersion>10.0.20348.0</Windows2PreviousTargetFrameworkVersion>
150160
<TizenPreviousTargetFrameworkVersion>7.0</TizenPreviousTargetFrameworkVersion>
@@ -178,6 +188,11 @@
178188
<MauiSamplePlatforms Condition="'$(IncludeAndroidTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-android;$(MauiSamplePlatforms)</MauiSamplePlatforms>
179189
<MauiSamplePlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-maccatalyst;$(MauiSamplePlatforms)</MauiSamplePlatforms>
180190
<MauiSamplePlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-ios;$(MauiSamplePlatforms)</MauiSamplePlatforms>
191+
<MauiSamplePreviousPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-tizen;$(MauiSamplePreviousPlatforms)</MauiSamplePreviousPlatforms>
192+
<MauiSamplePreviousPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPreviousPlatforms);$(MauiSamplePreviousPlatforms)</MauiSamplePreviousPlatforms>
193+
<MauiSamplePreviousPlatforms Condition="'$(IncludeAndroidTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-android;$(MauiSamplePreviousPlatforms)</MauiSamplePreviousPlatforms>
194+
<MauiSamplePreviousPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-maccatalyst;$(MauiSamplePreviousPlatforms)</MauiSamplePreviousPlatforms>
195+
<MauiSamplePreviousPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-ios;$(MauiSamplePreviousPlatforms)</MauiSamplePreviousPlatforms>
181196

182197
<!-- App: Device Tests TFMs (no Tizen yet) -->
183198
<MauiDeviceTestsPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPlatforms);$(MauiDeviceTestsPlatforms)</MauiDeviceTestsPlatforms>
@@ -200,9 +215,8 @@
200215
</PropertyGroup>
201216

202217
<PropertyGroup>
203-
<DotNetOutputPath>$(MSBuildThisFileDirectory)bin/</DotNetOutputPath>
204-
<DotNetTempDirectory>$(DotNetOutputPath)temp/</DotNetTempDirectory>
205-
<DotNetDirectory>$(DotNetOutputPath)dotnet/</DotNetDirectory>
218+
<DotNetTempDirectory>$(RepoRoot)temp/</DotNetTempDirectory>
219+
<DotNetDirectory>$(RepoRoot).dotnet/</DotNetDirectory>
206220
<DotNetToolPath>$(DotNetDirectory)dotnet</DotNetToolPath>
207221
<DotNetPacksDirectory>$(DotNetDirectory)packs/</DotNetPacksDirectory>
208222
<DotNetLibraryPacksDirectory>$(DotNetDirectory)library-packs/</DotNetLibraryPacksDirectory>
@@ -211,7 +225,7 @@
211225
<_MauiBuildTasksLocation>$(_MauiBuildTasksLocation)</_MauiBuildTasksLocation>
212226
<_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).buildtasks\</_MauiBuildTasksLocation>
213227
<_MauiAOTProfileLocation>$(MauiSrcDirectory)Controls\src\Build.Tasks\nuget\buildTransitive\netstandard2.0\</_MauiAOTProfileLocation>
214-
<StrongNamerKeyFile>$(MauiRootDirectory)eng/microsoft.maui.controls.snk</StrongNamerKeyFile>
228+
<StrongNamerKeyFile>$(MauiRootDirectory)eng/microsoft.maui.controls.snk</StrongNamerKeyFile>
215229
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
216230
<ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
217231
<ProduceReferenceAssemblyInOutDir>True</ProduceReferenceAssemblyInOutDir>

‎Directory.Build.targets

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,20 @@
1919
<Import Project="eng\NuGetVersions.targets" />
2020

2121
<PropertyGroup>
22-
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
22+
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
2323
<IgnoreMauiXamlHotReloadCompatibilityCheck>True</IgnoreMauiXamlHotReloadCompatibilityCheck>
2424
</PropertyGroup>
2525

26+
<PropertyGroup>
27+
<!-- Microsoft.Build.Msix.props" cannot be imported again -->
28+
<!-- Found version-specific or distribution-specific runtime identifier(s)-->
29+
<NoWarn>$(NoWarn);MSB4011;NETSDK1206</NoWarn>
30+
</PropertyGroup>
31+
2632
<!-- platform version number information -->
2733
<PropertyGroup Condition="'$(_MauiTargetPlatformIsiOS)' == 'True'">
28-
<SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
29-
<TargetPlatformMinVersion>11.0</TargetPlatformMinVersion>
34+
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
35+
<TargetPlatformMinVersion>13.0</TargetPlatformMinVersion>
3036
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
3137
<NoWarn>$(NoWarn);CA1416</NoWarn>
3238
</PropertyGroup>
@@ -37,14 +43,14 @@
3743
<NoWarn>$(NoWarn);CA1416</NoWarn>
3844
</PropertyGroup>
3945
<PropertyGroup Condition="'$(_MauiTargetPlatformIsMacCatalyst)' == 'True'">
40-
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
41-
<TargetPlatformMinVersion>13.1</TargetPlatformMinVersion>
46+
<SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
47+
<TargetPlatformMinVersion>15.0</TargetPlatformMinVersion>
4248
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
4349
<NoWarn>$(NoWarn);CA1416</NoWarn>
4450
</PropertyGroup>
4551
<PropertyGroup Condition="'$(_MauiTargetPlatformIsmacOS)' == 'True'">
46-
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
47-
<TargetPlatformMinVersion>10.14</TargetPlatformMinVersion>
52+
<SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
53+
<TargetPlatformMinVersion>12.0</TargetPlatformMinVersion>
4854
</PropertyGroup>
4955
<PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True'">
5056
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
@@ -55,8 +61,8 @@
5561
<TargetPlatformMinVersion>6.5</TargetPlatformMinVersion>
5662
</PropertyGroup>
5763

58-
<!--
59-
NOTE: The Contains('-windows10') is a bit of a hack
64+
<!--
65+
NOTE: The Contains('-windows10') is a bit of a hack
6066
because we don't want to set these properties for WPF projects...
6167
There's probably a better way we should find to infer this
6268
-->
@@ -65,7 +71,7 @@
6571
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
6672
</PropertyGroup>
6773

68-
<!--
74+
<!--
6975
Disable generation of obj/Debug/net8.0-android/__Microsoft.Android.Resource.Designer.cs
7076
Enable this individually in projects that declare/use AndroidResource IDs.
7177
-->
@@ -79,9 +85,9 @@
7985
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
8086
</ItemGroup>
8187

82-
<!-- Until we get a new enough dotnet -->
83-
<ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
84-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.31" TargetingPackVersion="10.0.19041.31" />
88+
<!-- Until we get net9 rtm -->
89+
<ItemGroup Condition=" '$(_MauiTargetPlatformIsWindows)' == 'True' AND '$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
90+
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
8591
</ItemGroup>
8692

8793
<!--

‎Microsoft.Maui-dev.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Mac.Test
256256
EndProject
257257
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.WinUI.Tests", "src\Controls\tests\TestCases.WinUI.Tests\Controls.TestCases.WinUI.Tests.csproj", "{A3E22F99-F380-4005-8483-3ACA6C104220}"
258258
EndProject
259+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.BindingSourceGen", "src\Controls\src\BindingSourceGen\Controls.BindingSourceGen.csproj", "{9538341F-8A00-4356-A2B2-5C2959979F22}"
260+
EndProject
261+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.BindingSourceGen.UnitTests", "src\Controls\tests\BindingSourceGen.UnitTests\Controls.BindingSourceGen.UnitTests.csproj", "{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47}"
262+
EndProject
259263
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITest.Analyzers", "src\TestUtils\src\UITest.Analyzers\UITest.Analyzers.csproj", "{55905937-1399-46DB-BA38-E426801CB759}"
260264
EndProject
261265
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
@@ -653,6 +657,14 @@ Global
653657
{A3E22F99-F380-4005-8483-3ACA6C104220}.Debug|Any CPU.Build.0 = Debug|Any CPU
654658
{A3E22F99-F380-4005-8483-3ACA6C104220}.Release|Any CPU.ActiveCfg = Release|Any CPU
655659
{A3E22F99-F380-4005-8483-3ACA6C104220}.Release|Any CPU.Build.0 = Release|Any CPU
660+
{9538341F-8A00-4356-A2B2-5C2959979F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
661+
{9538341F-8A00-4356-A2B2-5C2959979F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
662+
{9538341F-8A00-4356-A2B2-5C2959979F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
663+
{9538341F-8A00-4356-A2B2-5C2959979F22}.Release|Any CPU.Build.0 = Release|Any CPU
664+
{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
665+
{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
666+
{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
667+
{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47}.Release|Any CPU.Build.0 = Release|Any CPU
656668
{55905937-1399-46DB-BA38-E426801CB759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
657669
{55905937-1399-46DB-BA38-E426801CB759}.Debug|Any CPU.Build.0 = Debug|Any CPU
658670
{55905937-1399-46DB-BA38-E426801CB759}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -781,6 +793,8 @@ Global
781793
{5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
782794
{6E1ADE49-680E-4CA3-8FEA-6450802F8250} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
783795
{A3E22F99-F380-4005-8483-3ACA6C104220} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
796+
{9538341F-8A00-4356-A2B2-5C2959979F22} = {50C758FE-4E10-409A-94F5-A75480960864}
797+
{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
784798
{55905937-1399-46DB-BA38-E426801CB759} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
785799
{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
786800
EndGlobalSection

0 commit comments

Comments
 (0)