Skip to content
This repository was archived by the owner on May 17, 2019. It is now read-only.

Commit 27020c5

Browse files
author
Hananiel Sarella
authored
Merge pull request #7 from hananiel/targeting_packs
Enable cross platform compilation of the solution.
2 parents 31b534f + 0224c26 commit 27020c5

File tree

5 files changed

+23
-0
lines changed

5 files changed

+23
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,4 @@ FakesAssemblies/
197197
# DNX-based projects have a project.lock.json file. This should not be checked-in during development
198198
project.lock.json
199199
.vscode
200+
.idea

targetframework.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
<PropertyGroup Condition="! $(OS.Contains('win')) AND '$(TargetFramework)'== 'net461'">
3+
<FrameworkPathOverride>$(NuGetPackageRoot)microsoft.targetingpack.netframework.v4.6.1/1.0.1/lib/net461/</FrameworkPathOverride>
4+
<RestoreAdditionalProjectSources>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</RestoreAdditionalProjectSources>
5+
</PropertyGroup>
6+
<ItemGroup Condition="! $(OS.Contains('win')) AND '$(TargetFramework)'== 'net461'">
7+
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.6.1" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" />
8+
</ItemGroup>
9+
</Project>
10+

test/Steeltoe.Common.Autofac.Test/Steeltoe.Common.Autofac.Test.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;net461</TargetFrameworks>
77
</PropertyGroup>
88

9+
<PropertyGroup Condition="! $(OS.Contains('win')) AND '$(TargetFramework)'== 'net461'">
10+
<FrameworkPathOverride>$(NuGetPackageRoot)microsoft.targetingpack.netframework.v4.6.1/1.0.1/lib/net461/</FrameworkPathOverride>
11+
<RestoreAdditionalProjectSources>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</RestoreAdditionalProjectSources>
12+
</PropertyGroup>
13+
<ItemGroup Condition="! $(OS.Contains('win')) AND '$(TargetFramework)'== 'net461'">
14+
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.6.1" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" />
15+
</ItemGroup>
16+
917
<ItemGroup>
1018
<None Update="xunit.runner.json">
1119
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

test/Steeltoe.Common.Http.Test/Steeltoe.Common.Http.Test.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;net461</TargetFrameworks>
77
</PropertyGroup>
8+
9+
<Import Project="..\..\targetframework.props" />
810

911
<ItemGroup>
1012
<None Update="xunit.runner.json">

test/Steeltoe.Common.Test/Steeltoe.Common.Test.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;net461</TargetFrameworks>
77
</PropertyGroup>
8+
9+
<Import Project="..\..\targetframework.props" />
810

911
<ItemGroup>
1012
<None Update="xunit.runner.json">

0 commit comments

Comments
 (0)