Skip to content

Commit fe24d85

Browse files
sebastienrossebastienros
authored
Merge pull request #22790 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'
2 parents 6c31da5 + 948c62e commit fe24d85

25 files changed

+69
-106
lines changed

‎.azure/pipelines/blazor-daily-tests.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎eng/Baseline.Designer.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-sql-cache' ">
1919
<BaselinePackageVersion>3.1.5</BaselinePackageVersion>
2020
</PropertyGroup>
21+
<!-- Package: Microsoft.Authentication.WebAssembly.Msal-->
22+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' ">
23+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
24+
</PropertyGroup>
25+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND '$(TargetFramework)' == 'netstandard2.1' ">
26+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[3.2.0, )" />
27+
</ItemGroup>
2128
<!-- Package: Microsoft.AspNetCore.ApiAuthorization.IdentityServer-->
2229
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' ">
2330
<BaselinePackageVersion>3.1.5</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Update this list when preparing for a new patch.
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
1010
<Package Id="dotnet-sql-cache" Version="3.1.5" />
11+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
1112
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
1213
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
1314
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />

‎eng/Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@
123123
the entire pattern will silently fail to evaluate correctly.
124124
-->
125125
<DotNetProjects Include="
126-
$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj;
127-
$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj;
126+
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
127+
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
128+
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
128129
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
129130
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
130131
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;

‎src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
<PropertyGroup>
66
<TargetFramework>netstandard2.1</TargetFramework>
77
<Description>Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C</Description>
8-
<IsShippingPackage>true</IsShippingPackage>
9-
<HasReferenceAssembly>false</HasReferenceAssembly>
108
<RazorLangVersion>3.0</RazorLangVersion>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
129
</PropertyGroup>
1310

1411
<ItemGroup>

‎src/Components/WebAssembly/testassets/Directory.Build.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
1313
<SignAssembly>false</SignAssembly>
14+
<IsTestAssetProject>true</IsTestAssetProject>
15+
<IsPackable>false</IsPackable>
1416
</PropertyGroup>
1517

1618
<ItemGroup>

‎src/Components/benchmarkapps/Wasm.Performance/TestApp/Wasm.Performance.TestApp.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<HasReferenceAssembly>false</HasReferenceAssembly>
88
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
99
<ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
10+
<IsTestAssetProject>true</IsTestAssetProject>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎src/Components/test/E2ETest/e2eTestSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"DefaultWaitTimeoutInSeconds": 20,
3-
"ScreenShotsPath": "../../screenshots",
3+
"ScreenShotsPath": "../../screenshots"
44
}

‎src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5+
<IsShippingPackage>false</IsShippingPackage>
6+
<IsPackable>true</IsPackable>
7+
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
8+
<PackageId>$(TargetingPackName).Internal</PackageId>
9+
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
10+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
11+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
12+
<IncludeBuildOutput>false</IncludeBuildOutput>
13+
<IncludeSymbols>false</IncludeSymbols>
14+
<NoPackageAnalysis>true</NoPackageAnalysis>
15+
</PropertyGroup>
16+
17+
</Project>

‎src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj renamed to ‎src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<IsPackable>true</IsPackable>
77
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
8+
<!-- This is typically based on whether the project sits in a folder named `ref`, which this one does not - but we want it to resolve references like a ref project -->
9+
<IsReferenceAssemblyProject>true</IsReferenceAssemblyProject>
810
<PackageId>$(TargetingPackName)</PackageId>
911
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
1012
<!-- This is a reference package and does not include any dependencies. -->
@@ -59,7 +61,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
5961
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
6062
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
6163
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
62-
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
64+
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
6365
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6466
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
6567
</ProjectReference>

‎src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj renamed to ‎src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

File renamed without changes.

‎src/Framework/src/runtimeconfig.template.json renamed to ‎src/Framework/App.Runtime/src/runtimeconfig.template.json

File renamed without changes.

‎src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,33 @@
5252
</ItemGroup>
5353

5454
<ItemGroup>
55-
<ProjectReference Include="..\ref\Microsoft.AspNetCore.App.Ref.csproj">
55+
<ProjectReference Include="..\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
5656
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
5757
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
5858
</ProjectReference>
59-
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
59+
<ProjectReference Include="..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
6060
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6161
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
6262
</ProjectReference>
6363
</ItemGroup>
6464

6565
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
6666
<!-- Use the ref pack logic to compute the list of expected targeting pack content -->
67-
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
67+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
6868
Targets="_ResolveTargetingPackContent"
6969
SkipNonexistentProjects="false">
7070
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
7171
</MSBuild>
7272

7373
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
74-
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
74+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
7575
Targets="_GetPackageVersionInfo"
7676
SkipNonexistentProjects="false">
7777
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />
7878
</MSBuild>
7979

8080
<!-- Runtime and Ref packs may have separate versions. -->
81-
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
81+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
8282
Targets="_GetPackageVersionInfo"
8383
SkipNonexistentProjects="false">
8484
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />

‎src/Installers/Debian/Runtime/Debian.Runtime.debproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
25+
<ProjectReference Include="..\..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
2626
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2727
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2828
</ProjectReference>

‎src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
29+
<ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
3030
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3131
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3232
</ProjectReference>

‎src/Installers/Rpm/Rpm.Runtime.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
21+
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
2222
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2323
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2424
</ProjectReference>

‎src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
18+
<ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
1919
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2020
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2121
</ProjectReference>

‎src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<ProjectReference Include="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
35+
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
3636
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3737
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3838
</ProjectReference>

‎src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/GenerateTestProps.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Condition="$(DesignTimeBuild) != true">
66
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
77
<!-- If we aren't building the targeting pack, use the baseline version -->
8-
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
8+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
99
Targets="_GetPackageVersionInfo"
1010
SkipNonexistentProjects="false"
1111
Condition="'$(IsTargetingPackBuilding)' != 'false'">
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<!-- Runtime and Ref packs may have separate versions. -->
22-
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
22+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
2323
Targets="_GetPackageVersionInfo"
2424
SkipNonexistentProjects="false">
2525
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />

‎src/ProjectTemplates/ProjectTemplates.sln

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTemplates.Tests", "t
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolsInstaller", "testassets\DotNetToolsInstaller\DotNetToolsInstaller.csproj", "{4B971DBF-6B07-4DC5-914D-4D5681F220CC}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj", "{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}"
19-
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{E6B319D0-6A92-47D8-BC46-904DA44664A5}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{05291368-373F-48AA-84FC-5B1E4606641A}"
@@ -179,6 +177,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaSer
179177
EndProject
180178
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorTemplates.Tests", "BlazorTemplates.Tests\BlazorTemplates.Tests.csproj", "{5526E9AA-F147-43F6-8FA3-21A93D2A813E}"
181179
EndProject
180+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj", "{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}"
181+
EndProject
182182
Global
183183
GlobalSection(SolutionConfigurationPlatforms) = preSolution
184184
Debug|Any CPU = Debug|Any CPU
@@ -261,18 +261,6 @@ Global
261261
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x64.Build.0 = Release|Any CPU
262262
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.ActiveCfg = Release|Any CPU
263263
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.Build.0 = Release|Any CPU
264-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
265-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
266-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.ActiveCfg = Debug|Any CPU
267-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.Build.0 = Debug|Any CPU
268-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.ActiveCfg = Debug|Any CPU
269-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.Build.0 = Debug|Any CPU
270-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
271-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.Build.0 = Release|Any CPU
272-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.ActiveCfg = Release|Any CPU
273-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.Build.0 = Release|Any CPU
274-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.ActiveCfg = Release|Any CPU
275-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.Build.0 = Release|Any CPU
276264
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
277265
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
278266
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1233,13 +1221,24 @@ Global
12331221
{5526E9AA-F147-43F6-8FA3-21A93D2A813E}.Release|x64.Build.0 = Release|Any CPU
12341222
{5526E9AA-F147-43F6-8FA3-21A93D2A813E}.Release|x86.ActiveCfg = Release|Any CPU
12351223
{5526E9AA-F147-43F6-8FA3-21A93D2A813E}.Release|x86.Build.0 = Release|Any CPU
1224+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1225+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
1226+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Debug|x64.ActiveCfg = Debug|Any CPU
1227+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Debug|x64.Build.0 = Debug|Any CPU
1228+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Debug|x86.ActiveCfg = Debug|Any CPU
1229+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Debug|x86.Build.0 = Debug|Any CPU
1230+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
1231+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Release|Any CPU.Build.0 = Release|Any CPU
1232+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Release|x64.ActiveCfg = Release|Any CPU
1233+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Release|x64.Build.0 = Release|Any CPU
1234+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Release|x86.ActiveCfg = Release|Any CPU
1235+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2}.Release|x86.Build.0 = Release|Any CPU
12361236
EndGlobalSection
12371237
GlobalSection(SolutionProperties) = preSolution
12381238
HideSolutionNode = FALSE
12391239
EndGlobalSection
12401240
GlobalSection(NestedProjects) = preSolution
12411241
{4B971DBF-6B07-4DC5-914D-4D5681F220CC} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
1242-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
12431242
{E6B319D0-6A92-47D8-BC46-904DA44664A5} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
12441243
{05291368-373F-48AA-84FC-5B1E4606641A} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
12451244
{4BA90E96-EFFC-40CD-B101-054F492F77BE} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
@@ -1319,6 +1318,7 @@ Global
13191318
{81B96508-D920-45F6-9534-0D348B11DFAB} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13201319
{6012D544-32B4-4F5C-B335-A224AA4F661D} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13211320
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
1321+
{F1986ED3-135F-4D1F-8367-0BEA5BB400D2} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13221322
EndGlobalSection
13231323
GlobalSection(ExtensibilityGlobals) = postSolution
13241324
SolutionGuid = {D2F122BA-928C-4179-B503-6744DB64BA13}

0 commit comments

Comments
 (0)