Merge pull request #17 from LiamMorrow/1.4.1

1.4.1
LiamMorrow · Nov 16, 2020 · 7509cb5 · 7509cb5
2 parents 5540e8f + 2929257
commit 7509cb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
-        <Version>1.4.1-prerelease2</Version>
+        <Version>1.4.1</Version>
         <Authors>Liam Morrow</Authors>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <IncludeSymbols>true</IncludeSymbols>

diff --git a/src/OrgnalR.Core/OrgnalR.Core.csproj b/src/OrgnalR.Core/OrgnalR.Core.csproj
@@ -16,6 +16,10 @@
         </PackageReference>
         <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <!-- We have to explicitly target these two System packages.  There is a conflict between two of our packages. See: https://github.com/LiamMorrow/OrgnalR/issues/13 -->
         <PackageReference Include="System.IO" Version="4.3.0" />
         <PackageReference Include="System.Text.Encoding" Version="4.3.0" />
     </ItemGroup>