Fix up .NET 6 sln (#8997)

microsoft · Aug 30, 2024 · 8a7349e · 8a7349e
1 parent 15418ce
commit 8a7349e
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 72 deletions.
diff --git a/source/dotnet/AdaptiveCardsNet6.sln b/source/dotnet/AdaptiveCardsNet6.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Net6.Sample.I
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Sample.WPFVisualizer.Net6", "Samples\WPFVisualizerNet6\AdaptiveCards.Sample.WPFVisualizer.Net6.csproj", "{96144C6C-2E37-4A84-95AB-7F01D9222F2F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Templating.Net6", "Library\AdaptiveCards.Templating.Net6\AdaptiveCards.Templating.Net6.csproj", "{615381C8-0ADC-4CBE-B827-2E71497B1970}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCards.Templating", "Library\AdaptiveCards.Templating\AdaptiveCards.Templating.csproj", "{F455297F-3A61-4340-B62A-118FB4279561}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -277,62 +277,62 @@ Global
 		{96144C6C-2E37-4A84-95AB-7F01D9222F2F}.Release|x64.Build.0 = Release|Any CPU
 		{96144C6C-2E37-4A84-95AB-7F01D9222F2F}.Release|x86.ActiveCfg = Release|Any CPU
 		{96144C6C-2E37-4A84-95AB-7F01D9222F2F}.Release|x86.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|arm64.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|arm64.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|arm64.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|arm64.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x64.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.AppStore|x86.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|ARM.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|arm64.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x64.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Debug|x86.Build.0 = Debug|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|Any CPU.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|ARM.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|ARM.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|arm64.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|arm64.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhone.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x64.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x64.Build.0 = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x86.ActiveCfg = Release|Any CPU
-		{615381C8-0ADC-4CBE-B827-2E71497B1970}.Release|x86.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|arm64.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|arm64.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|arm64.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|arm64.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x64.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.AppStore|x86.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|arm64.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x64.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Debug|x86.Build.0 = Debug|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|ARM.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|arm64.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhone.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|x64.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|x64.Build.0 = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|x86.ActiveCfg = Release|Any CPU
+		{F455297F-3A61-4340-B62A-118FB4279561}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -342,7 +342,7 @@ Global
 		{34F849F9-E349-4237-B7CB-A63884DAB39D} = {C7727147-4AD9-4005-A8D0-EEEED82347D3}
 		{925EA86A-0B9F-4277-B05C-A3586DA3CA4D} = {C443BF0A-C616-4E98-8994-C5BAE76AE556}
 		{96144C6C-2E37-4A84-95AB-7F01D9222F2F} = {C443BF0A-C616-4E98-8994-C5BAE76AE556}
-		{615381C8-0ADC-4CBE-B827-2E71497B1970} = {C7727147-4AD9-4005-A8D0-EEEED82347D3}
+		{F455297F-3A61-4340-B62A-118FB4279561} = {C7727147-4AD9-4005-A8D0-EEEED82347D3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {252F0196-794B-4F99-967E-81962ADF58DD}

diff --git a/source/dotnet/Library/AdaptiveCards.Net6/AdaptiveCards.csproj b/source/dotnet/Library/AdaptiveCards.Net6/AdaptiveCards.csproj
@@ -11,7 +11,7 @@
     <PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseFile>EULA-Windows.txt</PackageLicenseFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <DocumentationFile>$(MSBuildProjectDirectory)/docs/AdaptiveCards.xml</DocumentationFile>
@@ -63,4 +63,4 @@
   </ItemGroup>
   <!-- workaround for multiple TargetFramework regression -->
   <Target Name="_CheckForGenerateAppxPackageOnBuild" />
-</Project>
+</Project>
diff --git a/...otnet/Library/AdaptiveCards.Templating.CSharp.WinRT/AdaptiveCards.Templating.WinRT.csproj b/...otnet/Library/AdaptiveCards.Templating.CSharp.WinRT/AdaptiveCards.Templating.WinRT.csproj
@@ -12,7 +12,7 @@
     <PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseFile>EULA-Windows.txt</PackageLicenseFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/source/dotnet/Library/AdaptiveCards.Templating/AdaptiveCards.Templating.csproj b/source/dotnet/Library/AdaptiveCards.Templating/AdaptiveCards.Templating.csproj
@@ -13,7 +13,7 @@
     <PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/microsoft/AdaptiveCards/issues/2448</PackageProjectUrl>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
 
     <LangVersion>12</LangVersion>

diff --git a/source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj b/source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj
@@ -11,7 +11,7 @@
     <PackageIconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseFile>EULA-Windows.txt</PackageLicenseFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <GenerateAssemblyInfo Condition="$(Tfs_PackageVersionNumber) != ''">false</GenerateAssemblyInfo>

diff --git a/source/dotnet/NuGet/AdaptiveCards.Rendering.Wpf.nuspec b/source/dotnet/NuGet/AdaptiveCards.Rendering.Wpf.nuspec
@@ -36,8 +36,6 @@
     </frameworkReferences>
   </metadata>
   <files>
-    <file src="..\Library\AdaptiveCards.Rendering.Wpf\bin\Release\net4.5.2\AdaptiveCards.Rendering.Wpf.dll" target="lib\net452"/>
-
     <file src="..\Library\AdaptiveCards.Rendering.Wpf.Net6\bin\Release\net6.0-windows\AdaptiveCards.Rendering.Wpf.Net6.dll" target="lib\net6.0-windows7.0"/>
 
     <file src="EULA-Windows.txt" target="\"/>

diff --git a/source/dotnet/NuGet/AdaptiveCards.nuspec b/source/dotnet/NuGet/AdaptiveCards.nuspec
@@ -36,12 +36,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\Library\AdaptiveCards\bin\Release\net4.5.2\AdaptiveCards.dll" target="lib\net452"/>
-    <file src="..\Library\AdaptiveCards\bin\Release\net4.5.2\AdaptiveCards.xml" target="lib\net452"/>
-
-    <file src="..\Library\AdaptiveCards\bin\Release\netstandard1.3\AdaptiveCards.dll" target="lib\netstandard1.3"/>
-    <file src="..\Library\AdaptiveCards\bin\Release\netstandard1.3\AdaptiveCards.xml" target="lib\netstandard1.3"/>
-
     <file src="..\Library\AdaptiveCards\bin\Release\netstandard2.0\AdaptiveCards.dll" target="lib\netstandard2.0"/>
     <file src="..\Library\AdaptiveCards\bin\Release\netstandard2.0\AdaptiveCards.xml" target="lib\netstandard2.0"/>
 
@@ -50,4 +44,4 @@
 
     <file src="EULA-Windows.txt" target="\"/>
   </files>
-</package>
+</package>