Skip to content

Commit 5abe489

Browse files
almedina-msrahulamlekarRahulAmlekarRebecca Muraira
authored
[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>
1 parent 536aaff commit 5abe489

14 files changed

+128
-7
lines changed

‎custom.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionMajor>3</VersionMajor>
55
<VersionMinor>0</VersionMinor>
66
<!-- The nuget package version should be incremented when we produce QFEs -->
7-
<NuGetPackVersion>3.0.0</NuGetPackVersion>
7+
<NuGetPackVersion>1.0.0</NuGetPackVersion>
88
<VersionInfoProductName>AdaptiveCards</VersionInfoProductName>
99
</PropertyGroup>
1010
</Project>

‎schemas/1.5.0/adaptive-card.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,18 @@
314314
2293
315315
]
316316
},
317+
"rtl": {
318+
"anyOf": [
319+
{
320+
"type": "boolean"
321+
},
322+
{
323+
"type": "null"
324+
}
325+
],
326+
"description": "When `true` content in this Adaptive Card should be presented right to left. When 'false' content in this Adaptive Card should be presented left to right. If unset, the default platform behavior will apply.",
327+
"version": "1.5"
328+
},
317329
"speak": {
318330
"type": "string",
319331
"description": "Specifies what should be spoken for this entire card. This is simple text or SSML fragment."
@@ -447,7 +459,7 @@
447459
"type": "null"
448460
}
449461
],
450-
"description": "When `true` content in this container should be presented right to left. When 'false' content in this container should be presented left to right. When unset layout direction will inherit from parent container or column. If unset in all ancestors, the default platform behavior will apply.",
462+
"description": "When `true` content in this column should be presented right to left. When 'false' content in this column should be presented left to right. When unset layout direction will inherit from parent container or column. If unset in all ancestors, the default platform behavior will apply.",
451463
"version": "1.5"
452464
},
453465
"separator": {

‎schemas/src/AdaptiveCard.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@
6161
2293
6262
]
6363
},
64+
"rtl": {
65+
"type": "boolean?",
66+
"description": "When `true` content in this Adaptive Card should be presented right to left. When 'false' content in this Adaptive Card should be presented left to right. If unset, the default platform behavior will apply.",
67+
"version": "1.5"
68+
},
6469
"speak": {
6570
"type": "string",
6671
"description": "Specifies what should be spoken for this entire card. This is simple text or SSML fragment."

‎schemas/src/elements/Column.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"rtl": {
4646
"type": "boolean?",
47-
"description": "When `true` content in this container should be presented right to left. When 'false' content in this container should be presented left to right. When unset layout direction will inherit from parent container or column. If unset in all ancestors, the default platform behavior will apply.",
47+
"description": "When `true` content in this column should be presented right to left. When 'false' content in this column should be presented left to right. When unset layout direction will inherit from parent container or column. If unset in all ancestors, the default platform behavior will apply.",
4848
"version": "1.5"
4949
},
5050
"separator": {

‎schemas/src/enums/ChoiceInputStyle.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"description": "Style hint for `Input.ChoiceSet`.",
55
"values": [
66
"compact",
7-
"expanded"
7+
"expanded",
8+
{
9+
"value": "filtered",
10+
"description": "Allows users to filter choices in a choice set.",
11+
"version": "1.5"
12+
}
813
]
914
}

‎source/nodejs/adaptivecards-site/schema-explorer-toc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- Fact
1717
- ImageSet
1818
- Table
19+
- TableCell
1920
- Actions:
2021
- Action.OpenUrl
2122
- Action.Submit

‎source/uwp/Build/CopySignFiles.cmd‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ REM This script copies the dll and winmd files to have different names to be sig
44
REM setting platform variables
55
set AC=AdaptiveCards
66
set ACUWP=AdaptiveCards.Rendering.Uwp
7+
set ACOM=AdaptiveCards.ObjectModel.Uwp
78

89
REM setting path variables
910
set ACROOT=source\uwp\
1011
set ACPATH=AdaptiveCardRenderer\
12+
set ACPATHOM=AdaptiveCardsObjectModel\
1113
set BINPATH=Release\
1214

1315
if "%2" == "" goto :usage
@@ -34,6 +36,21 @@ call :checkedCopy %ACROOT%x64\Release\%ACPATH%%ACUWP%.dll tosign\%ACPATH%x64\%AC
3436
call :checkedCopy %ACROOT%ARM\Release\%ACPATH%%ACUWP%.dll tosign\%ACPATH%ARM\%ACUWP%.dll
3537
call :checkedCopy %ACROOT%ARM64\Release\%ACPATH%%ACUWP%.dll tosign\%ACPATH%ARM64\%ACUWP%.dll
3638

39+
REM AdaptiveCards
40+
echo %ACPATHOM%
41+
REM AdaptiveCards ObjectModel
42+
43+
mkdir tosign\%ACPATHOM%\Win32
44+
mkdir tosign\%ACPATHOM%\x64
45+
mkdir tosign\%ACPATHOM%\ARM
46+
mkdir tosign\%ACPATHOM%\ARM64
47+
48+
call :checkedCopy %ACROOT%\Release\%ACPATHOM%%ACOM%.winmd tosign\%ACPATHOM%%ACOM%.winmd
49+
call :checkedCopy %ACROOT%Release\%ACPATHOM%%ACOM%.dll tosign\%ACPATHOM%Win32\%ACOM%.dll
50+
call :checkedCopy %ACROOT%x64\Release\%ACPATHOM%%ACOM%.dll tosign\%ACPATHOM%x64\%ACOM%.dll
51+
call :checkedCopy %ACROOT%ARM\Release\%ACPATHOM%%ACOM%.dll tosign\%ACPATHOM%ARM\%ACOM%.dll
52+
call :checkedCopy %ACROOT%ARM64\Release\%ACPATHOM%%ACOM%.dll tosign\%ACPATHOM%ARM64\%ACOM%.dll
53+
3754
popd
3855
goto :end
3956

@@ -47,6 +64,13 @@ call :checkedCopy signed\%ACPATH%x64\%ACUWP%.dll %ACROOT%x64\Release\%ACPATH%%AC
4764
call :checkedCopy signed\%ACPATH%ARM\%ACUWP%.dll %ACROOT%ARM\Release\%ACPATH%%ACUWP%.dll
4865
call :checkedCopy signed\%ACPATH%ARM64\%ACUWP%.dll %ACROOT%ARM64\Release\%ACPATH%%ACUWP%.dll
4966

67+
REM AdaptiveCardsObjectModel
68+
call :checkedCopy signed\%ACPATHOM%%ACOM%.winmd %ACROOT%Release\%ACPATHOM%%ACOM%.winmd
69+
call :checkedCopy signed\%ACPATHOM%Win32\%ACOM%.dll %ACROOT%Release\%ACPATHOM%%ACOM%.dll
70+
call :checkedCopy signed\%ACPATHOM%x64\%ACOM%.dll %ACROOT%x64\Release\%ACPATHOM%%ACOM%.dll
71+
call :checkedCopy signed\%ACPATHOM%ARM\%ACOM%.dll %ACROOT%ARM\Release\%ACPATHOM%%ACOM%.dll
72+
call :checkedCopy signed\%ACPATHOM%ARM64\%ACOM%.dll %ACROOT%ARM64\Release\%ACPATHOM%%ACOM%.dll
73+
5074
popd
5175
goto :end
5276

‎source/uwp/NuGet/AdaptiveCards.ObjectModel.Uwp.native.targets‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<AdaptiveCards-Platform Condition="'$(Platform)' == 'Win32'">x86</AdaptiveCards-Platform>
5+
<AdaptiveCards-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</AdaptiveCards-Platform>
6+
</PropertyGroup>
7+
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'UAP'">
8+
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\native\AdaptiveCards.ObjectModel.Uwp.winmd">
9+
<Implementation>AdaptiveCards.ObjectModel.Uwp.dll</Implementation>
10+
</Reference>
11+
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(AdaptiveCards-Platform)\native\AdaptiveCards.ObjectModel.Uwp.dll" />
12+
</ItemGroup>
13+
</Project>

‎source/uwp/NuGet/AdaptiveCards.ObjectModel.Uwp.nuspec‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>AdaptiveCards.ObjectModel.Uwp</id>
5+
<version>1.0.0</version>
6+
<authors>Microsoft</authors>
7+
<summary>Adaptive Cards Object Model library for UWP</summary>
8+
<description>Used to work with the object model for Adaptive Cards</description>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<tags>adaptivecards;adaptive-cards</tags>
11+
<projectUrl>https://adaptivecards.io</projectUrl>
12+
<iconUrl>https://adaptivecards.io/content/icons_blue/blue-48.png</iconUrl>
13+
<license type="file">EULA-Windows.txt</license>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
15+
</metadata>
16+
<files>
17+
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.winmd" target="lib\uap10.0"/>
18+
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.winmd" target="lib\native"/>
19+
20+
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-x86\native"/>
21+
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-x86\native"/>
22+
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-x86\native"/>
23+
<file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-x86\native"/>
24+
25+
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-x64\native"/>
26+
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-x64\native"/>
27+
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-x64\native"/>
28+
<file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-x64\native"/>
29+
30+
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-arm\native"/>
31+
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-arm\native"/>
32+
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-arm\native"/>
33+
<file src="..\ARM\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-arm\native"/>
34+
35+
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.dll" target="runtimes\win10-arm64\native"/>
36+
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.lib" target="runtimes\win10-arm64\native"/>
37+
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pri" target="runtimes\win10-arm64\native"/>
38+
<file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.Uwp.pdb" target="runtimes\win10-arm64\native"/>
39+
40+
<file src="EULA-Windows.txt" target="\"/>
41+
<file src="AdaptiveCards.ObjectModel.Uwp.targets" target="build\uap10.0"/>
42+
<file src="AdaptiveCards.ObjectModel.Uwp.native.targets" target="build\native\AdaptiveCards.ObjectModel.Uwp.targets"/>
43+
</files>
44+
</package>

‎source/uwp/NuGet/AdaptiveCards.ObjectModel.Uwp.targets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="CheckNonUwpApp" Condition="'$(TargetPlatformIdentifier)' != 'UAP'" BeforeTargets="PrepareForBuild">
4+
<Error Text="Only UWP apps/libraries are supported." />
5+
</Target>
6+
<ItemGroup Condition="'$(ProjectExt)' != '.vcxproj'">
7+
<SDKReference Include="Microsoft.VCLibs, Version=14.0">
8+
<Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
9+
</SDKReference>
10+
</ItemGroup>
11+
</Project>

0 commit comments

Comments
 (0)