Fix .NET codesign build (#1235)

* fix builds for delay sign * fix build script * fix signconfig
microsoft · Mar 7, 2018 · 59e2f9b · 59e2f9b
1 parent 6700649
commit 59e2f9b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/source/dotnet/Build/CopySignFiles.cmd b/source/dotnet/Build/CopySignFiles.cmd
@@ -7,7 +7,8 @@ set ACHTML=AdaptiveCards.Rendering.Html
 set ACWPF=AdaptiveCards.Rendering.Wpf
 set ACWPFX=AdaptiveCards.Rendering.Wpf.Xceed
 set ACNET=net4.5.2
-set ACSTANDARD=netstandard1.3
+set ACSTANDARD13=netstandard1.3
+set ACSTANDARD20=netstandard2.0
 
 REM setting path variables
 set ACROOT=source\dotnet\Library\
@@ -17,7 +18,8 @@ set ACWPFPATH=AdaptiveCards.Rendering.Wpf\
 set ACWPFXPATH=AdaptiveCards.Rendering.Wpf.Xceed\
 set BINPATH=bin\Release\
 set ACNETPATH=net4.5.2\
-set ACSTANDARDPATH=netstandard1.3\
+set ACSTANDARD13PATH=netstandard1.3\
+set ACSTANDARD20PATH=netstandard2.0\
 
 if "%2" == "" goto :usage
 if "%1" == "sign" goto :sign
@@ -31,11 +33,13 @@ pushd "%2"
 REM AdaptiveCards
 echo %ACPATH%
 mkdir tosign\%ACPATH%%ACNETPATH%
-mkdir tosign\%ACPATH%%ACSTANDARDPATH%
+mkdir tosign\%ACPATH%%ACSTANDARD13PATH%
+mkdir tosign\%ACPATH%%ACSTANDARD20PATH%
 
 REM AdaptiveCards.Html
 mkdir tosign\%ACHTMLPATH%%ACNETPATH%
-mkdir tosign\%ACHTMLPATH%%ACSTANDARDPATH%
+mkdir tosign\%ACHTMLPATH%%ACSTANDARD13PATH%
+mkdir tosign\%ACHTMLPATH%%ACSTANDARD20PATH%
 
 REM AdaptiveCards.Rendering.Wpf
 mkdir tosign\%ACWPFPATH%%ACNETPATH%
@@ -46,11 +50,13 @@ mkdir tosign\%ACWPFXPATH%%ACNETPATH%
 
 REM AdaptiveCards
 call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACNETPATH%%AC%.dll tosign\%ACPATH%%ACNETPATH%%AC%.dll
-call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACSTANDARDPATH%%AC%.dll tosign\%ACPATH%%ACSTANDARDPATH%%AC%%ACSTANDARD%.dll
+call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD13PATH%%AC%.dll tosign\%ACPATH%%ACSTANDARD13PATH%%AC%%ACSTANDARD13%.dll
+call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD20PATH%%AC%.dll tosign\%ACPATH%%ACSTANDARD20PATH%%AC%%ACSTANDARD20%.dll
 
 REM AdaptiveCards.Html
 call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACNETPATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACNETPATH%%ACHTML%.dll      
-call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARDPATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACSTANDARDPATH%%ACHTML%%ACSTANDARD%.dll
+call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD13PATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACSTANDARD13PATH%%ACHTML%%ACSTANDARD13%.dll
+call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD20PATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACSTANDARD20PATH%%ACHTML%%ACSTANDARD20%.dll
 
 REM AdaptiveCards.Rendering.Wpf
 call :checkedCopy %ACROOT%%ACWPFPATH%%BINPATH%%ACNETPATH%%ACWPF%.dll tosign\%ACWPFPATH%%ACNETPATH%%ACWPF%.dll      
@@ -66,11 +72,13 @@ pushd "%2"
 
 REM AdaptiveCards
 call :checkedCopy signed\%ACPATH%%ACNETPATH%%AC%.dll %ACROOT%%ACPATH%%BINPATH%%ACNETPATH%%AC%.dll                         
-call :checkedCopy signed\%ACPATH%%ACSTANDARDPATH%%AC%%ACSTANDARD%.dll %ACROOT%%ACPATH%%BINPATH%%ACSTANDARDPATH%%AC%.dll                         
+call :checkedCopy signed\%ACPATH%%ACSTANDARD13PATH%%AC%%ACSTANDARD13%.dll %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD13PATH%%AC%.dll                         
+call :checkedCopy signed\%ACPATH%%ACSTANDARD20PATH%%AC%%ACSTANDARD20%.dll %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD20PATH%%AC%.dll                         
 
 REM AdaptiveCards.Html
 call :checkedCopy signed\%ACHTMLPATH%%ACNETPATH%%ACHTML%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACNETPATH%%ACHTML%.dll                         
-call :checkedCopy signed\%ACHTMLPATH%%ACSTANDARDPATH%%ACHTML%%ACSTANDARD%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARDPATH%%ACHTML%.dll                         
+call :checkedCopy signed\%ACHTMLPATH%%ACSTANDARD13PATH%%ACHTML%%ACSTANDARD13%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD13PATH%%ACHTML%.dll                         
+call :checkedCopy signed\%ACHTMLPATH%%ACSTANDARD20PATH%%ACHTML%%ACSTANDARD20%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD20PATH%%ACHTML%.dll                         
 
 REM AdaptiveCards.Rendering.Wpf
 call :checkedCopy signed\%ACWPFPATH%%ACNETPATH%%ACWPF%.dll %ACROOT%%ACWPFPATH%%BINPATH%%ACNETPATH%%ACWPF%.dll                         

diff --git a/source/dotnet/Build/SignConfig.xml b/source/dotnet/Build/SignConfig.xml
@@ -9,9 +9,11 @@
     <!-- AdaptiveCards -->
     <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards\net4.5.2\AdaptiveCards.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards\net4.5.2\AdaptiveCards.dll" />
     <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards\netstandard1.3\AdaptiveCardsnetstandard1.3.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards\netstandard1.3\AdaptiveCardsnetstandard1.3.dll" />
+    <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards\netstandard2.0\AdaptiveCardsnetstandard2.0.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards\netstandard2.0\AdaptiveCardsnetstandard2.0.dll" />
     <!-- AdaptiveCards.Html -->
     <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards.Rendering.Html\net4.5.2\AdaptiveCards.Rendering.Html.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards.Rendering.Html\net4.5.2\AdaptiveCards.Rendering.Html.dll" />
     <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards.Rendering.Html\netstandard1.3\AdaptiveCards.Rendering.Htmlnetstandard1.3.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards.Rendering.Html\netstandard1.3\AdaptiveCards.Rendering.Htmlnetstandard1.3.dll" />
+    <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards.Rendering.Html\netstandard2.0\AdaptiveCards.Rendering.Htmlnetstandard2.0.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards.Rendering.Html\netstandard2.0\AdaptiveCards.Rendering.Htmlnetstandard2.0.dll" />
     <!-- AdaptiveCards.Wpf-->
     <file src="__RELBINPATH__\..\..\..\s\tosign\AdaptiveCards.Rendering.Wpf\net4.5.2\AdaptiveCards.Rendering.Wpf.dll" signType="Both" dest="__RELBINPATH__\..\..\..\s\signed\AdaptiveCards.Rendering.Wpf\net4.5.2\AdaptiveCards.Rendering.Wpf.dll" />
     <!-- AdaptiveCards.Wpf.Xceed-->

diff --git a/source/dotnet/Library/AdaptiveCards.Rendering.Html/AdaptiveCards.Rendering.Html.csproj b/source/dotnet/Library/AdaptiveCards.Rendering.Html/AdaptiveCards.Rendering.Html.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net4.5.2;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net4.5.2;netstandard1.3;netstandard2.0</TargetFrameworks>
     <Authors>AdaptiveCards</Authors>
     <Summary>Adaptive Card renderer for generating HTML tags</Summary>
     <Description>This library provides the ability to render an Adaptive Card into HTML, typically used for server-side card rendering</Description>
@@ -11,6 +11,7 @@
     <PackageIconUrl>http://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/AdaptiveCards/master/LICENSE</PackageLicenseUrl>
+    <DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...dotnet/Library/AdaptiveCards.Rendering.Wpf.Xceed/AdaptiveCards.Rendering.Wpf.Xceed.csproj b/...dotnet/Library/AdaptiveCards.Rendering.Wpf.Xceed/AdaptiveCards.Rendering.Wpf.Xceed.csproj
@@ -12,6 +12,7 @@
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/AdaptiveCards/master/LICENSE</PackageLicenseUrl>
     <RootNamespace>AdaptiveCards.Rendering.Wpf</RootNamespace>
+    <DefineConstants>WPF;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/source/dotnet/Library/AdaptiveCards.Rendering.Wpf/AdaptiveCards.Rendering.Wpf.csproj b/source/dotnet/Library/AdaptiveCards.Rendering.Wpf/AdaptiveCards.Rendering.Wpf.csproj
@@ -11,7 +11,7 @@
     <PackageIconUrl>http://adaptivecards.io/content/icons_blue/blue-48.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/AdaptiveCards/master/LICENSE</PackageLicenseUrl>
-    <DefineConstants>WPF</DefineConstants>
+    <DefineConstants>WPF;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj b/source/dotnet/Library/AdaptiveCards/AdaptiveCards.csproj
@@ -12,6 +12,7 @@
     <RepositoryUrl>https://github.com/Microsoft/AdaptiveCards</RepositoryUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/AdaptiveCards/master/LICENSE</PackageLicenseUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <DefineConstants>$(DefineConstants);$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <!--HACKY check to see if UWP SDK is installed, if so, generate a uap10.0 output -->