Skip to content

Commit bd8615d

Browse files
authored
[.NET] Get .Net Standard 1.3 back in the build (#3325)
* [.NET] Get .Net Standard 1.3 back in the build Fixes #3323. This reverts commit 3c63421. This reverts commit 1974570. * Remove unnecessary `Debugger.Break();` call
1 parent ab56001 commit bd8615d

4 files changed

Lines changed: 13 additions & 14 deletions

File tree

source/dotnet/Build/CopySignFiles.cmd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set ACHTML=AdaptiveCards.Rendering.Html
77
set ACWPF=AdaptiveCards.Rendering.Wpf
88
set ACWPFX=AdaptiveCards.Rendering.Wpf.Xceed
99
set ACNET=net4.5.2
10+
set ACSTANDARD13=netstandard1.3
1011
set ACSTANDARD20=netstandard2.0
1112

1213
REM setting path variables
@@ -17,6 +18,7 @@ set ACWPFPATH=AdaptiveCards.Rendering.Wpf\
1718
set ACWPFXPATH=AdaptiveCards.Rendering.Wpf.Xceed\
1819
set BINPATH=bin\Release\
1920
set ACNETPATH=net4.5.2\
21+
set ACSTANDARD13PATH=netstandard1.3\
2022
set ACSTANDARD20PATH=netstandard2.0\
2123

2224
if "%2" == "" goto :usage
@@ -31,10 +33,12 @@ pushd "%2"
3133
REM AdaptiveCards
3234
echo %ACPATH%
3335
mkdir tosign\%ACPATH%%ACNETPATH%
36+
mkdir tosign\%ACPATH%%ACSTANDARD13PATH%
3437
mkdir tosign\%ACPATH%%ACSTANDARD20PATH%
3538

3639
REM AdaptiveCards.Html
3740
mkdir tosign\%ACHTMLPATH%%ACNETPATH%
41+
mkdir tosign\%ACHTMLPATH%%ACSTANDARD13PATH%
3842
mkdir tosign\%ACHTMLPATH%%ACSTANDARD20PATH%
3943

4044
REM AdaptiveCards.Rendering.Wpf
@@ -46,10 +50,12 @@ mkdir tosign\%ACWPFXPATH%%ACNETPATH%
4650

4751
REM AdaptiveCards
4852
call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACNETPATH%%AC%.dll tosign\%ACPATH%%ACNETPATH%%AC%.dll
53+
call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD13PATH%%AC%.dll tosign\%ACPATH%%ACSTANDARD13PATH%%AC%%ACSTANDARD13%.dll
4954
call :checkedCopy %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD20PATH%%AC%.dll tosign\%ACPATH%%ACSTANDARD20PATH%%AC%%ACSTANDARD20%.dll
5055

5156
REM AdaptiveCards.Html
5257
call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACNETPATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACNETPATH%%ACHTML%.dll
58+
call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD13PATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACSTANDARD13PATH%%ACHTML%%ACSTANDARD13%.dll
5359
call :checkedCopy %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD20PATH%%ACHTML%.dll tosign\%ACHTMLPATH%%ACSTANDARD20PATH%%ACHTML%%ACSTANDARD20%.dll
5460

5561
REM AdaptiveCards.Rendering.Wpf
@@ -66,10 +72,12 @@ pushd "%2"
6672

6773
REM AdaptiveCards
6874
call :checkedCopy signed\%ACPATH%%ACNETPATH%%AC%.dll %ACROOT%%ACPATH%%BINPATH%%ACNETPATH%%AC%.dll
75+
call :checkedCopy signed\%ACPATH%%ACSTANDARD13PATH%%AC%%ACSTANDARD13%.dll %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD13PATH%%AC%.dll
6976
call :checkedCopy signed\%ACPATH%%ACSTANDARD20PATH%%AC%%ACSTANDARD20%.dll %ACROOT%%ACPATH%%BINPATH%%ACSTANDARD20PATH%%AC%.dll
7077

7178
REM AdaptiveCards.Html
7279
call :checkedCopy signed\%ACHTMLPATH%%ACNETPATH%%ACHTML%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACNETPATH%%ACHTML%.dll
80+
call :checkedCopy signed\%ACHTMLPATH%%ACSTANDARD13PATH%%ACHTML%%ACSTANDARD13%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD13PATH%%ACHTML%.dll
7381
call :checkedCopy signed\%ACHTMLPATH%%ACSTANDARD20PATH%%ACHTML%%ACSTANDARD20%.dll %ACROOT%%ACHTMLPATH%%BINPATH%%ACSTANDARD20PATH%%ACHTML%.dll
7482

7583
REM AdaptiveCards.Rendering.Wpf
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net4.5.2;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net4.5.2;netstandard1.3;netstandard2.0</TargetFrameworks>
55
<Authors>Microsoft</Authors>
66
<Summary>Adaptive Card renderer for generating HTML tags</Summary>
77
<Description>This library provides the ability to render an Adaptive Card into HTML, typically used for server-side card rendering</Description>
@@ -17,6 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20+
<PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
2021
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
2122
<PackageReference Include="System.Reflection" Version="4.3.0" />
2223
</ItemGroup>
@@ -26,18 +27,9 @@
2627
</ItemGroup>
2728

2829
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29-
<PackageReference Include="MarkedNet">
30-
<Version>2.1.2</Version>
31-
</PackageReference>
3230
<PackageReference Include="System.Reflection.TypeExtensions">
3331
<Version>4.4.0</Version>
3432
</PackageReference>
3533
</ItemGroup>
3634

37-
<ItemGroup Condition="'$(TargetFramework)' == 'net4.5.2'">
38-
<PackageReference Include="MarkedNet">
39-
<Version>2.1.2</Version>
40-
</PackageReference>
41-
</ItemGroup>
42-
4335
</Project>

source/dotnet/Library/AdaptiveCards.Rendering.Html/MarkdownToHtmlTagConverter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq;
66
using System.Xml;
77
using System.Xml.Linq;
8-
using MarkedNet;
8+
using Microsoft.MarkedNet;
99

1010
namespace AdaptiveCards.Rendering.Html
1111
{
@@ -17,7 +17,6 @@ public static IEnumerable<HtmlTag> Convert(string markdown)
1717
marked.Options.Mangle = false;
1818
marked.Options.Sanitize = true;
1919
marked.Options.XHtml = true;
20-
marked.Options.ExternalLinks = false;
2120

2221
var rawXhtml = marked.Parse(markdown);
2322
var root = XElement.Parse($"<root>{rawXhtml}</root>");

source/dotnet/Samples/AdaptiveCards.Sample.Html/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ function activateMedia(button) {{
320320
321321
<!-- if element is not visible -> skip (The separator was hidden in the previous step) -->
322322
if(child.style.display == 'none'){{
323-
continue;
323+
continue;
324324
}}
325325
326-
const childSeparatorId = child.dataset.acSeparatorid;
326+
const childSeparatorId = child.dataset.acSeparatorid;
327327
var childSeparator = document.getElementById(childSeparatorId);
328328
329329
if(isFirstElement){{

0 commit comments

Comments
 (0)