Skip to content
This repository was archived by the owner on Jul 8, 2024. It is now read-only.

Changed TargetFramework from net45 to net452 #152

Merged
merged 1 commit into from
Sep 7, 2021
Merged

Changed TargetFramework from net45 to net452 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.ElementModel/Hl7.Fhir.ElementModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net5.0;net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netstandard1.6;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\firely-net-common.props" />
Expand All @@ -15,7 +15,7 @@
<AssemblyName>Hl7.Fhir.ElementModel</AssemblyName>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netstandard1.6'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'netstandard1.6'">
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Serialization/Hl7.Fhir.Serialization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netstandard1.6;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\firely-net-common.props" />
Expand Down
6 changes: 3 additions & 3 deletions src/Hl7.Fhir.Support.Poco/Hl7.Fhir.Support.Poco.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>
<TargetFrameworks>net5.0;net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netstandard1.6;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\firely-net-common.props" />
Expand All @@ -16,11 +16,11 @@
<AssemblyName>Hl7.Fhir.Support.Poco</AssemblyName>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net45'">
<ItemGroup Condition=" '$(TargetFramework)' != 'net452'">
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452'">
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Net.Http"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Support.Tests/Hl7.Fhir.Support.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net40' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Support/Hl7.Fhir.Support.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netstandard1.6;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\firely-net-common.props" />
Expand All @@ -15,7 +15,7 @@
<AssemblyName>Hl7.Fhir.Support</AssemblyName>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net45'">
<ItemGroup Condition=" '$(TargetFramework)' != 'net452'">
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/Hl7.Fhir.Support/Utility/SemVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Hl7.Fhir.Utility
/// A semantic version implementation.
/// Conforms with v2.0.0 of http://semver.org
/// </summary>
#if !NET45
#if !NET452
public sealed class SemVersion : IComparable<SemVersion>, IComparable
#else
[Serializable]
Expand All @@ -27,14 +27,14 @@ public sealed class SemVersion : IComparable<SemVersion>, IComparable, ISerializ
@"(?>\.(?<patch>\d+))?" +
@"(?>\-(?<pre>[0-9A-Za-z\-\.]+))?" +
@"(?>\+(?<build>[0-9A-Za-z\-\.]+))?$",
#if !NET45
#if !NET452
RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture
#else
RegexOptions.CultureInvariant | RegexOptions.Compiled | RegexOptions.ExplicitCapture
#endif
);

#if NET45
#if NET452
#pragma warning disable CA1801 // Parameter unused
/// <summary>
/// Deserialize a <see cref="SemVersion"/>.
Expand Down Expand Up @@ -479,7 +479,7 @@ public override int GetHashCode()
}
}

#if NET45
#if NET452
/// <summary>
/// Populates a <see cref="SerializationInfo"/> with the data needed to serialize the target object.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.FhirPath/Hl7.FhirPath.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;net45;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netstandard1.6;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\firely-net-common.props" />
Expand Down