Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions source/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<!-- remove any machine-wide sources with <clear/> -->
<clear />
<add key="AdaptiveCards-Dependencies" value="https://pkgs.dev.azure.com/shine-oss/AdaptiveCards/_packaging/AdaptiveCards-Dependencies/nuget/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to get removed before merging. I was having trouble resolving packages locally, so I added it just to get things working for me.

</packageSources>
<disabledPackageSources>
<clear />
<add key="AdaptiveCards-Dependencies" value="true" />
</disabledPackageSources>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win10-arm64\native"/>
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win10-arm64\native"/>

<!-- .NET 6.0 projection -->
<file src="..\AnyCPU\ObjectModelCsProjection\$Configuration$\net6.0-windows10.0.17763.0\ObjectModelCsProjection.dll" target="lib\net6.0-windows10.0.17763.0\ObjectModelCsProjection.dll"/>

<!-- .NET 8.0 projection -->
<file src="..\AnyCPU\ObjectModelCsProjection\$Configuration$\net8.0-windows10.0.17763.0\ObjectModelCsProjection.dll" target="lib\net8.0-windows10.0.17763.0\ObjectModelCsProjection.dll"/>

<file src="EULA-Windows.txt" target="\"/>
<file src="AdaptiveCards.ObjectModel.WinUI3.native.targets" target="build\native\AdaptiveCards.ObjectModel.WinUI3.targets"/>
</files>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@
<file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win10-arm64\native"/>
<file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win10-arm64\native"/>

<!-- .NET 6.0 projection -->
<file src="..\AnyCPU\RendererCsProjection\$Configuration$\net6.0-windows10.0.17763.0\RendererCsProjection.dll" target="lib\net6.0-windows10.0.17763.0\RendererCsProjection.dll" />

<!-- .NET 8.0 projection -->
<file src="..\AnyCPU\RendererCsProjection\$Configuration$\net8.0-windows10.0.17763.0\RendererCsProjection.dll" target="lib\net8.0-windows10.0.17763.0\RendererCsProjection.dll" />

<file src="EULA-Windows.txt" target="\"/>
<file src="AdaptiveCards.Rendering.WinUI3.native.targets" target="build\native\AdaptiveCards.Rendering.WinUI3.targets"/>
</files>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
<TargetFrameworks>net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<WindowsSdkPackageVersion>10.0.17763.38</WindowsSdkPackageVersion>
<!-- Set Platform to AnyCPU to allow consumption of the projection assembly from any architecture. -->
<Platform>AnyCPU</Platform>
<RootNamespace>AdaptiveCards.ObjectModel.WinUI3</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<UseWinUI>true</UseWinUI>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>

<!-- Suppress warning about win10-* RIDs in dependencies for .NET 8.0+ -->
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
</PropertyGroup>
<PropertyGroup>
<CsWinRTIncludes>AdaptiveCards.ObjectModel.WinUI3</CsWinRTIncludes>
<CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
<BaseOutputPath>$(SolutionDir)\$(Platform)\$(MSBuildProjectName)</BaseOutputPath>
<CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
<CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
<TargetFrameworks>net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<WindowsSdkPackageVersion>10.0.17763.38</WindowsSdkPackageVersion>
<!-- Set Platform to AnyCPU to allow consumption of the projection assembly from any architecture. -->
<Platform>AnyCPU</Platform>
<RootNamespace>AdaptiveCards.Rendering.WinUI3</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<UseWinUI>true</UseWinUI>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>

<!-- Suppress warning about win10-* RIDs in dependencies for .NET 8.0+ -->
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
</PropertyGroup>
<PropertyGroup>
<CsWinRTIncludes>AdaptiveCards.Rendering.WinUI3</CsWinRTIncludes>
<CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
<BaseOutputPath>$(SolutionDir)\$(Platform)\$(MSBuildProjectName)</BaseOutputPath>
<CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
<CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using AdaptiveCards.ObjectModel.WinUI3;
using Windows.Data.Json;


namespace WinUI3ObjectModelTest
{
[TestClass]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<WindowsSdkPackageVersion>10.0.17763.38</WindowsSdkPackageVersion>
<RootNamespace>WinUI3ObjectModelTest</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnableMsixTooling>true</EnableMsixTooling>

<!-- Suppress warning about win10-* RIDs in dependencies for .NET 8.0+ -->
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>

<!-- AOT Compatibility Analysis -->
<IsAotCompatible>true</IsAotCompatible>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>

<!-- Enable AOT warnings to show at build time -->
<WarningsAsErrors>$(WarningsAsErrors);IL2026;IL3050;IL2087;IL2091</WarningsAsErrors>
</PropertyGroup>

<ItemGroup>
Expand All @@ -28,9 +37,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
<PackageReference Include="MSTest.TestAdapter">
<Version>3.0.2</Version>
</PackageReference>
Expand Down