Skip to content

Commit cc0a5c8

Browse files
anna-dingleralmedina-msrahulamlekarRahulAmlekarRebecca Muraira
authored
[UWP] Cherry-pick object model nuget changes (#8239)
* [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> * [UWP] Update custom.props for object model release (#8225) * Update custom.props for object model release * Updated Xcode version (#8222) * removed build step as they are redundant (#8201) * removed build step as they are redundant * added pod installation step Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com> * Remove blank space 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>
1 parent 38b8f09 commit cc0a5c8

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

custom.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Label="Version">
4-
<VersionMajor>3</VersionMajor>
5-
<VersionMinor>0</VersionMinor>
4+
<VersionMajor>1</VersionMajor>
5+
<VersionMinor>1</VersionMinor>
66
<!-- The nuget package version should be incremented when we produce QFEs -->
7-
<NuGetPackVersion>3.0.2</NuGetPackVersion>
7+
<NuGetPackVersion>1.1.0</NuGetPackVersion>
88
<VersionInfoProductName>AdaptiveCards</VersionInfoProductName>
99
</PropertyGroup>
1010
</Project>

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

0 commit comments

Comments
 (0)