Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multitargeting #317

Closed
wants to merge 9 commits into from
Closed

Multitargeting #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96aa73d
multitarget
andrewheumann May 10, 2020
ffab929
fix build errors
andrewheumann May 10, 2020
b6bb237
more framework tweaks
andrewheumann May 10, 2020
15459b8
simplify further
andrewheumann May 10, 2020
bf71652
back to 3.1
andrewheumann May 10, 2020
57aecfc
update travis
andrewheumann May 10, 2020
9992652
travis fix
andrewheumann May 10, 2020
d62287c
more travis troubleshooting
andrewheumann May 10, 2020
81b4bdf
more travis fun
andrewheumann May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
language: csharp
solution: ./hypar.sln
dist: trusty
dist: xenial
mono: none
dotnet: 2.1.502
dotnet: 3.1
install:
- dotnet restore
script:
- dotnet build ./Elements.sln
- dotnet build ./Elements.sln --framework=netcoreapp3.1
- dotnet test ./test/Elements.Tests/Elements.Tests.csproj
env:
- TRAVIS=true
2 changes: 1 addition & 1 deletion src/Elements/Elements.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<AssemblyName>Hypar.Elements</AssemblyName>
<PackageTitle>Hypar Elements</PackageTitle>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Elements/Serialization/IFC/IFCElementExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal static List<IfcProduct> ToIfcProducts(this Element e,
IfcProductDefinitionShape shape = null;
GeometricElement geoElement = null;
Transform trans = null;
Guid id;
Guid id = default(Guid);

if (e is ElementInstance)
{
Expand Down
6 changes: 3 additions & 3 deletions test/Elements.Tests/Elements.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Hypar.Elements.Tests</AssemblyName>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>Elements</RootNamespace>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Elements\Elements.csproj" />
<ProjectReference Properties="TargetFramework=netstandard2.0" Include="..\..\src\Elements\Elements.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down