Skip to content

Commit 5ee7e77

Browse files
Merge pull request #7 from ShawnLaMountain/main
Now supporting .Net Standard v1.0 - v2.1
2 parents a5f9c58 + c9319d9 commit 5ee7e77

6 files changed

Lines changed: 19 additions & 7 deletions

File tree

.github/workflows/CD.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
jobs:
2525
pack:
2626

27-
runs-on: [windows-latest]
27+
runs-on: [windows-2019]
2828

2929
steps:
3030
- name: Checkout

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
build:
1616

17-
runs-on: [windows-latest]
17+
runs-on: [windows-2019]
1818

1919
steps:
2020
- name: Checkout

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![CD](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/actions/workflows/CD.yml/badge.svg)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/actions/workflows/CD.yml)
44
[![Nuget](https://img.shields.io/nuget/v/ThunderDesign.Net-PCL.Dynamic)](https://www.nuget.org/packages/ThunderDesign.Net-PCL.Dynamic)
55
[![License](https://img.shields.io/github/license/ThunderDesign/ThunderDesign.Net-PCL.Dynamic)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/blob/main/LICENSE)
6-
[![Net](https://img.shields.io/badge/.net%20standard-2.0-blue)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/blob/main/README.md)
6+
[![Net](https://img.shields.io/badge/.net%20standard-v1.0%20--%20v2.1-blue)](https://github.com/ThunderDesign/ThunderDesign.Net-PCL.Dynamic/blob/main/README.md)
77

88
A combination of generic Dynamic Thread-Safe objects that can be used in all application types.
99

samples/Xamarin/SimpleContacts/SimpleContacts.Android/SimpleContacts.Android.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1818
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1919
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
20-
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
2121
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
2222
<AndroidUseAapt2>true</AndroidUseAapt2>
2323
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>

samples/Xamarin/SimpleContacts/SimpleContacts/SimpleContacts.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.5" />
9+
<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.6" />
1010
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
1111
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
1212
</ItemGroup>
Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
3+
<TargetFrameworks>netstandard1.0;netstandard2.0;net461</TargetFrameworks>
44
<RootNamespace>ThunderDesign.Net_PCL.Dynamic</RootNamespace>
5+
<PackageReadmeFile>README.md</PackageReadmeFile>
56
</PropertyGroup>
67

8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
9+
<DefineConstants>NETSTANDARD1_4</DefineConstants>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<None Include="..\..\README.md">
14+
<Pack>True</Pack>
15+
<PackagePath>\</PackagePath>
16+
</None>
17+
</ItemGroup>
18+
719
<ItemGroup>
8-
<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.5" />
20+
<PackageReference Include="ThunderDesign.Net-PCL.Threading" Version="1.0.6" />
921
</ItemGroup>
1022
</Project>

0 commit comments

Comments
 (0)