use system.net.http from gac

govau · May 4, 2021 · fe2027d · fe2027d
1 parent 68a2398
commit fe2027d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ environment.sh
 .DS_Store
 .idea/
 /src/Notify.Tests/Notify.Tests.csproj.user
+.env
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,11 +17,11 @@ docker build -t fsnetcore .
 You can then run tests or anything else through docker as follows:
 
 ```
-docker run -v (pwd):/src -w /src --env-file .env -it fsnetcore [COMMAND]
+docker run -v $(pwd):/src -w /src --env-file .env -it fsnetcore [COMMAND]
 
-docker run -v (pwd):/src -w /src --env-file .env -it fsnetcore make build
-docker run -v (pwd):/src -w /src --env-file .env -it fsnetcore make build-test
-docker run -v (pwd):/src -w /src --env-file .env -it fsnetcore make build-package
+docker run -v $(pwd):/src -w /src --env-file .env -it fsnetcore make build
+docker run -v $(pwd):/src -w /src --env-file .env -it fsnetcore make build-test
+docker run -v $(pwd):/src -w /src --env-file .env -it fsnetcore make build-package
 ```
 
 ## Tests

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM fsharp:netcore
+FROM fsharp:10.2.3-netcore
 
 RUN apt-get update && apt-get --no-install-recommends install -y make
diff --git a/src/Notify.Tests/Notify.Tests.csproj b/src/Notify.Tests/Notify.Tests.csproj
@@ -19,4 +19,8 @@
     <ProjectReference Include="..\Notify\Notify.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Notify/Notify.csproj b/src/Notify/Notify.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <TargetFrameworks>netstandard2.0;netcoreapp2.0;net462</TargetFrameworks>
-    <Version>2.7.0</Version>
+    <Version>2.7.1</Version>
     <Authors>Notify.gov.au, GOV.UK Notify</Authors>
     <Owners>Notify.gov.au</Owners>
     <Description>Notify.gov.au .NET client</Description>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
 
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,4 @@ environment.sh @@
     .DS_Store
     .idea/
     /src/Notify.Tests/Notify.Tests.csproj.user
+    .env