Skip to content

Commit

Permalink
[UWP Nuget]: Add ObjectModel .nuspec (#7204)
Browse files Browse the repository at this point in the history
* [Infrastructure] Disable failing push job from js-release.yml (#6563)

Disable push job from js-release.yml to be able to continue package release

* [UWP][Infra] Update nuget files for release (#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Changed pod to source form (#6582) (#6586)

* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings

* [Infrastructure][.NET] Update public key location for signing (#6589)

* Update public key name

* Fix name

* Test path

* Test path

* Test path

* Test path

* Test path

* Test path

* Update key to right key

* Updated min supported iOS version  (#6593)

* updated supported min version to iOS 12

* updated podspec

* updated symlinks

* [UWP]: Update ObjectModelProjection.vcxproj to have control flow guard (#6729)

* Update ObjectModelProjection.vcxproj

Add control guard on all flavors of binaries

* Update ObjectModelProjection.vcxproj

* [UWP] Update custom.props version for cfguard patch release

* [UWP]: Don't use AdaptiveImage to render BackgroundImage (#6838)

* increment version

* bring up to master

* update rendering nuspec

* update rendering nuspec

* remove deprecated html renderer

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: Nassim Amar <namar0x0309@users.noreply.github.com>
Co-authored-by: Paul Campbell (DEP) <paulcam@microsoft.com>
  • Loading branch information
8 people authored Apr 27, 2022
1 parent e53804f commit 2b07a25
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 2 deletions.
2 changes: 1 addition & 1 deletion custom.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<VersionMajor>3</VersionMajor>
<VersionMinor>0</VersionMinor>
<!-- The nuget package version should be incremented when we produce QFEs -->
<NuGetPackVersion>3.0.0</NuGetPackVersion>
<NuGetPackVersion>3.0.2</NuGetPackVersion>
<VersionInfoProductName>AdaptiveCards</VersionInfoProductName>
</PropertyGroup>
</Project>
13 changes: 13 additions & 0 deletions source/uwp/NuGet/AdaptiveCards.ObjectModel.Uwp.native.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AdaptiveCards-Platform Condition="'$(Platform)' == 'Win32'">x86</AdaptiveCards-Platform>
<AdaptiveCards-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</AdaptiveCards-Platform>
</PropertyGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'UAP'">
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\native\AdaptiveCards.ObjectModel.Uwp.winmd">
<Implementation>AdaptiveCards.ObjectModel.Uwp.dll</Implementation>
</Reference>
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(AdaptiveCards-Platform)\native\AdaptiveCards.ObjectModel.Uwp.dll" />
</ItemGroup>
</Project>
44 changes: 44 additions & 0 deletions source/uwp/NuGet/AdaptiveCards.ObjectModel.Uwp.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>AdaptiveCards.ObjectModel.Uwp</id>
<version>1.0.0</version>
<authors>Microsoft</authors>
<summary>Adaptive Cards Object Model library for UWP</summary>
<description>Used to work with the object model for Adaptive Cards</description>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>adaptivecards;adaptive-cards</tags>
<projectUrl>https://adaptivecards.io</projectUrl>
<iconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</iconUrl>
<license type="file">EULA-Windows.txt</license>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.winmd" target="lib\uap10.0"/>
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.winmd" target="lib\native"/>

<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-x86\native"/>
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-x86\native"/>
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-x86\native"/>
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-x86\native"/>

<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-x64\native"/>
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-x64\native"/>
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-x64\native"/>
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-x64\native"/>

<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-arm\native"/>
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-arm\native"/>
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-arm\native"/>
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-arm\native"/>

<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-arm64\native"/>
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-arm64\native"/>
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-arm64\native"/>
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-arm64\native"/>

<file src="EULA-Windows.txt" target="\"/>
<file src="AdaptiveCards.ObjectModel.Uwp.targets" target="build\uap10.0"/>
<file src="AdaptiveCards.ObjectModel.Uwp.native.targets" target="build\native\AdaptiveCards.ObjectModel.Uwp.targets"/>
</files>
</package>
11 changes: 11 additions & 0 deletions source/uwp/NuGet/AdaptiveCards.ObjectModel.Uwp.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="CheckNonUwpApp" Condition="'$(TargetPlatformIdentifier)' != 'UAP'" BeforeTargets="PrepareForBuild">
<Error Text="Only UWP apps/libraries are supported." />
</Target>
<ItemGroup Condition="'$(ProjectExt)' != '.vcxproj'">
<SDKReference Include="Microsoft.VCLibs, Version=14.0">
<Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
</SDKReference>
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion source/uwp/NuGet/AdaptiveCards.Rendering.Uwp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
<version>1.0.0</version>
<authors>Microsoft</authors>
<summary>Adaptive Cards library for UWP</summary>
<description>Used to render Adaptive Cards into UWP XAML or to work with the object model for C++ projects</description>
<description>Used to render Adaptive Cards into UWP XAML</description>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>adaptivecards;adaptive-cards</tags>
<projectUrl>https://adaptivecards.io</projectUrl>
<iconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</iconUrl>
<license type="file">EULA-Windows.txt</license>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="AdaptiveCards.ObjectModel.Uwp" version="1.0.0" />
</dependencies>
</metadata>
<files>
<file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.Uwp.winmd" target="lib\uap10.0"/>
Expand Down

0 comments on commit 2b07a25

Please sign in to comment.