Merge branch 'main' of https://github.com/tomlm/AdaptiveCards

tomlm · May 1, 2024 · e635f52 · e635f52
2 parents 18fbcdc + 2fb6768
commit e635f52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/source/dotnet/Library/AdaptiveCards.Net6/AdaptiveCards.csproj b/source/dotnet/Library/AdaptiveCards.Net6/AdaptiveCards.csproj
@@ -56,10 +56,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Vsxmd" Version="1.4.*">
+    <!--<PackageReference Include="Vsxmd" Version="1.4.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    </PackageReference>-->
   </ItemGroup>
   <!-- workaround for multiple TargetFramework regression -->
   <Target Name="_CheckForGenerateAppxPackageOnBuild" />

diff --git a/source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj b/source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net4.5.2;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Authors>Microsoft</Authors>
     <Summary>Adaptive Card object model for .NET</Summary>
     <Description>This library implements classes for building and serializing adaptive card objects</Description>
@@ -58,7 +58,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.*" />
     <PackageReference Include="System.Net.Http" Version="4.3.*" />
-    <PackageReference Include="Vsxmd" Version="1.4.*">
+    <PackageReference Include="Vsxmd" Version="1.4.*" Condition="$(TargetFramework) == 'uap10.0'">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>