Skip to content

Commit 8a7349e

Browse files
authored
Fix up .NET 6 sln (#8997)
1 parent 15418ce commit 8a7349e

File tree

7 files changed

+64
-72
lines changed

7 files changed

+64
-72
lines changed

source/dotnet/AdaptiveCardsNet6.sln

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Net6.Sample.I
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Sample.WPFVisualizer.Net6", "Samples\WPFVisualizerNet6\AdaptiveCards.Sample.WPFVisualizer.Net6.csproj", "{96144C6C-2E37-4A84-95AB-7F01D9222F2F}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Templating.Net6", "Library\AdaptiveCards.Templating.Net6\AdaptiveCards.Templating.Net6.csproj", "{615381C8-0ADC-4CBE-B827-2E71497B1970}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Templating", "Library\AdaptiveCards.Templating\AdaptiveCards.Templating.csproj", "{F455297F-3A61-4340-B62A-118FB4279561}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -277,62 +277,62 @@ Global
277277
{96144C6C-2E37-4A84-95AB-7F01D9222F2F}.Release|x64.Build.0 = Release|Any CPU
278278
{96144C6C-2E37-4A84-95AB-7F01D9222F2F}.Release|x86.ActiveCfg = Release|Any CPU
279279
{96144C6C-2E37-4A84-95AB-7F01D9222F2F}.Release|x86.Build.0 = Release|Any CPU
280-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
281-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
282-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
283-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
284-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|arm64.ActiveCfg = Release|Any CPU
285-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|arm64.Build.0 = Release|Any CPU
286-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
287-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
288-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
289-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
290-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
291-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
292-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
293-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
294-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
295-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|Any CPU.Build.0 = Debug|Any CPU
296-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|ARM.ActiveCfg = Debug|Any CPU
297-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|ARM.Build.0 = Debug|Any CPU
298-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|arm64.ActiveCfg = Release|Any CPU
299-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|arm64.Build.0 = Release|Any CPU
300-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
301-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhone.Build.0 = Debug|Any CPU
302-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
303-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
304-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x64.ActiveCfg = Debug|Any CPU
305-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x64.Build.0 = Debug|Any CPU
306-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x86.ActiveCfg = Debug|Any CPU
307-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x86.Build.0 = Debug|Any CPU
308-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
309-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|Any CPU.Build.0 = Debug|Any CPU
310-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|ARM.ActiveCfg = Debug|Any CPU
311-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|ARM.Build.0 = Debug|Any CPU
312-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|arm64.ActiveCfg = Debug|Any CPU
313-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|arm64.Build.0 = Debug|Any CPU
314-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhone.ActiveCfg = Debug|Any CPU
315-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhone.Build.0 = Debug|Any CPU
316-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
317-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
318-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x64.ActiveCfg = Debug|Any CPU
319-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x64.Build.0 = Debug|Any CPU
320-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x86.ActiveCfg = Debug|Any CPU
321-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x86.Build.0 = Debug|Any CPU
322-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|Any CPU.ActiveCfg = Release|Any CPU
323-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|Any CPU.Build.0 = Release|Any CPU
324-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|ARM.ActiveCfg = Release|Any CPU
325-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|ARM.Build.0 = Release|Any CPU
326-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|arm64.ActiveCfg = Release|Any CPU
327-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|arm64.Build.0 = Release|Any CPU
328-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhone.ActiveCfg = Release|Any CPU
329-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhone.Build.0 = Release|Any CPU
330-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
331-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
332-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x64.ActiveCfg = Release|Any CPU
333-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x64.Build.0 = Release|Any CPU
334-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x86.ActiveCfg = Release|Any CPU
335-
{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x86.Build.0 = Release|Any CPU
280+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
281+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
282+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
283+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
284+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|arm64.ActiveCfg = Debug|Any CPU
285+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|arm64.Build.0 = Debug|Any CPU
286+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
287+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
288+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
289+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
290+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
291+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
292+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
293+
{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
294+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
295+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|Any CPU.Build.0 = Debug|Any CPU
296+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|ARM.ActiveCfg = Debug|Any CPU
297+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|ARM.Build.0 = Debug|Any CPU
298+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|arm64.ActiveCfg = Debug|Any CPU
299+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|arm64.Build.0 = Debug|Any CPU
300+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
301+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhone.Build.0 = Debug|Any CPU
302+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
303+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
304+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x64.ActiveCfg = Debug|Any CPU
305+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x64.Build.0 = Debug|Any CPU
306+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x86.ActiveCfg = Debug|Any CPU
307+
{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x86.Build.0 = Debug|Any CPU
308+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
309+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|Any CPU.Build.0 = Debug|Any CPU
310+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|ARM.ActiveCfg = Debug|Any CPU
311+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|ARM.Build.0 = Debug|Any CPU
312+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|arm64.ActiveCfg = Debug|Any CPU
313+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|arm64.Build.0 = Debug|Any CPU
314+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhone.ActiveCfg = Debug|Any CPU
315+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhone.Build.0 = Debug|Any CPU
316+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
317+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
318+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x64.ActiveCfg = Debug|Any CPU
319+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x64.Build.0 = Debug|Any CPU
320+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x86.ActiveCfg = Debug|Any CPU
321+
{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x86.Build.0 = Debug|Any CPU
322+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|Any CPU.ActiveCfg = Release|Any CPU
323+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|Any CPU.Build.0 = Release|Any CPU
324+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|ARM.ActiveCfg = Release|Any CPU
325+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|ARM.Build.0 = Release|Any CPU
326+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|arm64.ActiveCfg = Release|Any CPU
327+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|arm64.Build.0 = Release|Any CPU
328+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhone.ActiveCfg = Release|Any CPU
329+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhone.Build.0 = Release|Any CPU
330+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
331+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
332+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|x64.ActiveCfg = Release|Any CPU
333+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|x64.Build.0 = Release|Any CPU
334+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|x86.ActiveCfg = Release|Any CPU
335+
{F455297F-3A61-4340-B62A-118FB4279561}.Release|x86.Build.0 = Release|Any CPU
336336
EndGlobalSection
337337
GlobalSection(SolutionProperties) = preSolution
338338
HideSolutionNode = FALSE
@@ -342,7 +342,7 @@ Global
342342
{34F849F9-E349-4237-B7CB-A63884DAB39D} = {C7727147-4AD9-4005-A8D0-EEEED82347D3}
343343
{925EA86A-0B9F-4277-B05C-A3586DA3CA4D} = {C443BF0A-C616-4E98-8994-C5BAE76AE556}
344344
{96144C6C-2E37-4A84-95AB-7F01D9222F2F} = {C443BF0A-C616-4E98-8994-C5BAE76AE556}
345-
{615381C8-0ADC-4CBE-B827-2E71497B1970} = {C7727147-4AD9-4005-A8D0-EEEED82347D3}
345+
{F455297F-3A61-4340-B62A-118FB4279561} = {C7727147-4AD9-4005-A8D0-EEEED82347D3}
346346
EndGlobalSection
347347
GlobalSection(ExtensibilityGlobals) = postSolution
348348
SolutionGuid = {252F0196-794B-4F99-967E-81962ADF58DD}

source/dotnet/Library/AdaptiveCards.Net6/AdaptiveCards.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
1212
<RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
1313
<PackageLicenseFile>EULA-Windows.txt</PackageLicenseFile>
14-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
14+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1515
<DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
1616
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1717
<DocumentationFile>$(MSBuildProjectDirectory)/docs/AdaptiveCards.xml</DocumentationFile>
@@ -63,4 +63,4 @@
6363
</ItemGroup>
6464
<!-- workaround for multiple TargetFramework regression -->
6565
<Target Name="_CheckForGenerateAppxPackageOnBuild" />
66-
</Project>
66+
</Project>

source/dotnet/Library/AdaptiveCards.Templating.CSharp.WinRT/AdaptiveCards.Templating.WinRT.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
1313
<RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
1414
<PackageLicenseFile>EULA-Windows.txt</PackageLicenseFile>
15-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1616
<DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
1717
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1818
<ImplicitUsings>enable</ImplicitUsings>

source/dotnet/Library/AdaptiveCards.Templating/AdaptiveCards.Templating.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
1414
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1515
<PackageProjectUrl>https://github.com/microsoft/AdaptiveCards/issues/2448</PackageProjectUrl>
16-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1717
<DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
1818

1919
<LangVersion>12</LangVersion>

source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
1212
<RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
1313
<PackageLicenseFile>EULA-Windows.txt</PackageLicenseFile>
14-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
14+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1515
<DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
1616
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1717
<GenerateAssemblyInfo Condition="$(Tfs_PackageVersionNumber) != ''">false</GenerateAssemblyInfo>

source/dotnet/NuGet/AdaptiveCards.Rendering.Wpf.nuspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
</frameworkReferences>
3737
</metadata>
3838
<files>
39-
<file src="..\Library\AdaptiveCards.Rendering.Wpf\bin\Release\net4.5.2\AdaptiveCards.Rendering.Wpf.dll" target="lib\net452"/>
40-
4139
<file src="..\Library\AdaptiveCards.Rendering.Wpf.Net6\bin\Release\net6.0-windows\AdaptiveCards.Rendering.Wpf.Net6.dll" target="lib\net6.0-windows7.0"/>
4240

4341
<file src="EULA-Windows.txt" target="\"/>

source/dotnet/NuGet/AdaptiveCards.nuspec

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
</dependencies>
3737
</metadata>
3838
<files>
39-
<file src="..\Library\AdaptiveCards\bin\Release\net4.5.2\AdaptiveCards.dll" target="lib\net452"/>
40-
<file src="..\Library\AdaptiveCards\bin\Release\net4.5.2\AdaptiveCards.xml" target="lib\net452"/>
41-
42-
<file src="..\Library\AdaptiveCards\bin\Release\netstandard1.3\AdaptiveCards.dll" target="lib\netstandard1.3"/>
43-
<file src="..\Library\AdaptiveCards\bin\Release\netstandard1.3\AdaptiveCards.xml" target="lib\netstandard1.3"/>
44-
4539
<file src="..\Library\AdaptiveCards\bin\Release\netstandard2.0\AdaptiveCards.dll" target="lib\netstandard2.0"/>
4640
<file src="..\Library\AdaptiveCards\bin\Release\netstandard2.0\AdaptiveCards.xml" target="lib\netstandard2.0"/>
4741

@@ -50,4 +44,4 @@
5044

5145
<file src="EULA-Windows.txt" target="\"/>
5246
</files>
53-
</package>
47+
</package>

0 commit comments

Comments
 (0)