Merge pull request #83 from mdsol/develop

Release of v5.1.3
mdsol · Jun 7, 2021 · 6ffbcf1 · 6ffbcf1
2 parents b97e608 + 075d574
commit 6ffbcf1
Show file tree

Hide file tree

Showing 63 changed files with 254 additions and 234 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -13,10 +13,8 @@ jobs:
           submodules: 'recursive'
       - name: Build the packages
         run: dotnet build --configuration Release /p:PackageOutputPath=$GITHUB_WORKSPACE/artifacts
-      - name: Run the tests
-        run: dotnet test $GITHUB_WORKSPACE/Medidata.MAuth.sln --framework net5.0
       - name: Publish the packages
         run: dotnet nuget push "$GITHUB_WORKSPACE/artifacts/*.nupkg" --source $ARTIFACTORY_PUSH_TARGET --api-key $API_KEY
         env:
-          API_KEY: ${{ format('{0}:{1}', secrets.ARTIFACTORY_USERNAME, secrets.ARTIFACTORY_PASSWORD) }}
+          API_KEY: ${{ format('{0}:{1}', secrets.ARTIFACTORY_USERNAME, secrets.ARTIFACTORY_API_KEY) }}
           ARTIFACTORY_PUSH_TARGET: https://mdsol.jfrog.io/artifactory/api/nuget/nuget-local/mauth-client-dotnet
diff --git a/.github/workflows/test-net461.yaml b/.github/workflows/test-net461.yaml
@@ -0,0 +1,17 @@
+name: Build and Test (.NET Framework 4.6.1)
+on: [push]
+jobs:
+  Test:
+    runs-on: windows-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - name: Run the Core tests
+        run: dotnet test $env:GITHUB_WORKSPACE\tests\Medidata.MAuth.CoreTests --framework net461
+      - name: Run the OWIN tests
+        run: dotnet test $env:GITHUB_WORKSPACE\tests\Medidata.MAuth.OwinTests --framework net461
+      - name: Run the WebAPI tests
+        run: dotnet test $env:GITHUB_WORKSPACE\tests\Medidata.MAuth.WebApiTests --framework net461
+
diff --git a/.github/workflows/test-net50.yaml b/.github/workflows/test-net50.yaml
@@ -0,0 +1,14 @@
+name: Build and Test (.NET 5.0)
+on: [push]
+jobs:
+  Test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - name: Run the Core tests
+        run: dotnet test $GITHUB_WORKSPACE/tests/Medidata.MAuth.CoreTests --framework net5.0
+      - name: Run the ASP.NET Core tests
+        run: dotnet test $GITHUB_WORKSPACE/tests/Medidata.MAuth.AspNetCoreTests --framework net5.0
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changes in Medidata.MAuth
 
+## v5.1.3
+- **[All]** Partially removed target framework multitargeting and specified single target framework for most of the
+  packages
+- **[Core]** Specified target framework as .NET Standard 2.0 and .NET 5.0
+- **[AspNetCore]** Specified target framework as .NET Standard 2.0
+- **[Owin]** Specified target framework as .NET Framework 4.6.1
+- **[WebApi]** Specified target framework as .NET Framework 4.6.1
+
 ## v5.1.2
 - **[Core]** Removed unnecessary dependency on `System.Net.Http` package.
 

diff --git a/Medidata.MAuth.sln b/Medidata.MAuth.sln
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A4336AA-6F7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B74DB39B-4FB3-4DB1-A9BF-526413E8040B}"
 	ProjectSection(SolutionItems) = preProject
-		appveyor.yml = appveyor.yml
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE.md = LICENSE.md
 		README.md = README.md
@@ -17,20 +16,27 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Core", "src\Medidata.MAuth.Core\Medidata.MAuth.Core.csproj", "{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9ED6F311-EB68-440E-A178-5C5F140F2340}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Tests", "tests\Medidata.MAuth.Tests\Medidata.MAuth.Tests.csproj", "{A1940D71-52B3-42EC-B2DF-70782AFFF23C}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Directory.Build.props = tests\Directory.Build.props
+		tests\Medidata.MAuth.AspNetCoreTests\xunit.runner.json = tests\Medidata.MAuth.AspNetCoreTests\xunit.runner.json
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Owin", "src\Medidata.MAuth.Owin\Medidata.MAuth.Owin.csproj", "{74308221-D7A5-4C15-86D2-62871655C24B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.WebApi", "src\Medidata.MAuth.WebApi\Medidata.MAuth.WebApi.csproj", "{E557F648-6FE1-432E-A8D7-BD00C18E5176}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F8B8C2CD-CBAE-42A5-A5FF-2A26E5275941}"
-	ProjectSection(SolutionItems) = preProject
-		build\build.ps1 = build\build.ps1
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.AspNetCore", "src\Medidata.MAuth.AspNetCore\Medidata.MAuth.AspNetCore.csproj", "{1BC50789-3BAE-4D87-B89C-C2658BFF6522}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.OwinTests", "tests\Medidata.MAuth.OwinTests\Medidata.MAuth.OwinTests.csproj", "{40559440-D817-4A5A-8712-93E7E1B3868E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.WebApiTests", "tests\Medidata.MAuth.WebApiTests\Medidata.MAuth.WebApiTests.csproj", "{C45178A0-AC69-4439-8C6D-448245051AF1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.CoreTests", "tests\Medidata.MAuth.CoreTests\Medidata.MAuth.CoreTests.csproj", "{CBAEE752-2B48-405D-96B6-9893DB1BDB30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Tests.Common", "tests\Medidata.MAuth.Tests.Common\Medidata.MAuth.Tests.Common.csproj", "{019393E9-6C95-4AA7-B7A2-D91B782A2A80}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.AspNetCoreTests", "tests\Medidata.MAuth.AspNetCoreTests\Medidata.MAuth.AspNetCoreTests.csproj", "{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +47,6 @@ Global
 		{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{74308221-D7A5-4C15-86D2-62871655C24B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74308221-D7A5-4C15-86D2-62871655C24B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74308221-D7A5-4C15-86D2-62871655C24B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,16 +59,40 @@ Global
 		{1BC50789-3BAE-4D87-B89C-C2658BFF6522}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1BC50789-3BAE-4D87-B89C-C2658BFF6522}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BC50789-3BAE-4D87-B89C-C2658BFF6522}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40559440-D817-4A5A-8712-93E7E1B3868E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40559440-D817-4A5A-8712-93E7E1B3868E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40559440-D817-4A5A-8712-93E7E1B3868E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40559440-D817-4A5A-8712-93E7E1B3868E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C45178A0-AC69-4439-8C6D-448245051AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C45178A0-AC69-4439-8C6D-448245051AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C45178A0-AC69-4439-8C6D-448245051AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C45178A0-AC69-4439-8C6D-448245051AF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
-		{A1940D71-52B3-42EC-B2DF-70782AFFF23C} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
 		{74308221-D7A5-4C15-86D2-62871655C24B} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
 		{E557F648-6FE1-432E-A8D7-BD00C18E5176} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
 		{1BC50789-3BAE-4D87-B89C-C2658BFF6522} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
+		{40559440-D817-4A5A-8712-93E7E1B3868E} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
+		{C45178A0-AC69-4439-8C6D-448245051AF1} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
+		{CBAEE752-2B48-405D-96B6-9893DB1BDB30} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
+		{019393E9-6C95-4AA7-B7A2-D91B782A2A80} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
+		{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0A4D3258-5262-45FC-8A21-832CCBBB5878}

diff --git a/src/Medidata.MAuth.AspNetCore/Medidata.MAuth.AspNetCore.csproj b/src/Medidata.MAuth.AspNetCore/Medidata.MAuth.AspNetCore.csproj
@@ -9,13 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
+    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Medidata.MAuth.Core/HttpRequestMessageExtensions.cs b/src/Medidata.MAuth.Core/HttpRequestMessageExtensions.cs
@@ -17,14 +17,13 @@ public async static Task<byte[]> GetRequestContentAsBytesAsync(this HttpRequestM
 #if NET5_0
         public static byte[] GetRequestContentAsBytes(this HttpRequestMessage request)
         {
-            using (var memoryStream = new MemoryStream())
+            using var memoryStream = new MemoryStream();
+
+            if (request.Content != null)
             {
-                if (request.Content != null)
-                {
-                    request.Content.ReadAsStream().CopyTo(memoryStream);
-                }
-                return memoryStream.ToArray();
+                request.Content.ReadAsStream().CopyTo(memoryStream);
             }
+            return memoryStream.ToArray();
         }
 #endif
     }

diff --git a/src/Medidata.MAuth.Core/MAuthCore.cs b/src/Medidata.MAuth.Core/MAuthCore.cs
@@ -97,7 +97,7 @@ internal byte[] GenerateSignature(HttpRequestMessage request, AuthenticationInfo
         }
 
         /// <summary>
-        /// Adds authentication information to a <see cref="HttpRequestMessage"/>. 
+        /// Adds authentication information to a <see cref="HttpRequestMessage"/>.
         /// </summary>
         /// <param name="request">The request to add the information to.</param>
         /// <param name="authInfo">
@@ -153,7 +153,7 @@ internal string CalculatePayload(HttpRequestMessage request, PrivateKeyAuthentic
             return (Constants.MAuthHeaderKey, Constants.MAuthTimeHeaderKey);
         }
 
- #if NET5_0
+#if NET5_0
         public HttpRequestMessage SignSync(HttpRequestMessage request, MAuthSigningOptions options)
         {
             var authInfo = new PrivateKeyAuthenticationInfo()
@@ -166,8 +166,6 @@ public HttpRequestMessage SignSync(HttpRequestMessage request, MAuthSigningOptio
             var contents = request.GetRequestContentAsBytes();
             return AddAuthenticationInfo(request, authInfo, contents);
         }
-
 #endif
-
     }
-}
+}
diff --git a/src/Medidata.MAuth.Core/MAuthCoreV2.cs b/src/Medidata.MAuth.Core/MAuthCoreV2.cs
@@ -106,7 +106,7 @@ internal byte[] GenerateSignature(HttpRequestMessage request, AuthenticationInfo
         }
 
         /// <summary>
-        /// Adds authentication information to a <see cref="HttpRequestMessage"/>. 
+        /// Adds authentication information to a <see cref="HttpRequestMessage"/>.
         /// </summary>
         /// <param name="request">The request to add the information to.</param>
         /// <param name="authInfo">
@@ -148,7 +148,6 @@ internal HttpRequestMessage AddAuthenticationInfo(
         internal string CalculatePayload(
             HttpRequestMessage request, PrivateKeyAuthenticationInfo authInfo, byte[] requestContents)
         {
-
             var unsignedData = GenerateSignature(request, authInfo, requestContents);
             var signer = new RSACryptoServiceProvider();
             signer.PersistKeyInCsp = false;

diff --git a/src/Medidata.MAuth.Core/Medidata.MAuth.Core.csproj b/src/Medidata.MAuth.Core/Medidata.MAuth.Core.csproj
@@ -3,37 +3,20 @@
   <PropertyGroup>
     <Description>A core package for Medidata HMAC protocol implementation. This package contains the core functionality which used by the MAuth authentication protocol-specific components. This package also can be used standalone if you want to sign HTTP/HTTPS requests with Medidata MAuth keys using the .NET HttpClient message handler mechanism.</Description>
     <AssemblyTitle>Medidata.MAuth.Core</AssemblyTitle>
-    <TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <AssemblyName>Medidata.MAuth.Core</AssemblyName>
     <PackageTags>medidata;mauth;hmac;authentication;core;httpclient;messagehandler</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
+    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
-  </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-        <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
-    </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="BouncyCastle" Version="1.8.1" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Medidata.MAuth.Core/Properties/AssemblyInfo.cs b/src/Medidata.MAuth.Core/Properties/AssemblyInfo.cs
@@ -1,7 +1,10 @@
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 [assembly: InternalsVisibleTo("Medidata.MAuth.AspNetCore")]
 [assembly: InternalsVisibleTo("Medidata.MAuth.Owin")]
 [assembly: InternalsVisibleTo("Medidata.MAuth.WebApi")]
-[assembly: InternalsVisibleTo("Medidata.Mauth.Tests")]
+[assembly: InternalsVisibleTo("Medidata.Mauth.Tests.Common")]
+[assembly: InternalsVisibleTo("Medidata.MAuth.CoreTests")]
+[assembly: InternalsVisibleTo("Medidata.MAuth.AspNetCoreTests")]
+[assembly: InternalsVisibleTo("Medidata.MAuth.OwinTests")]
+[assembly: InternalsVisibleTo("Medidata.MAuth.WebApiTests")]
diff --git a/src/Medidata.MAuth.Owin/Medidata.MAuth.Owin.csproj b/src/Medidata.MAuth.Owin/Medidata.MAuth.Owin.csproj
@@ -9,25 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
+    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Medidata.MAuth.Core\Medidata.MAuth.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Owin" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Owin" Version="3.1.0" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
-    <Reference Include="System.Net.Http" />
+    <PackageReference Include="Owin" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Owin" Version="4.2.0" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Medidata.MAuth.WebApi/Medidata.MAuth.WebApi.csproj b/src/Medidata.MAuth.WebApi/Medidata.MAuth.WebApi.csproj
@@ -9,23 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
+    <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Medidata.MAuth.Core\Medidata.MAuth.Core.csproj" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project>
+  <PropertyGroup>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/...Tests/Infrastructure/NonSeekableStream.cs → ...Tests/Infrastructure/NonSeekableStream.cs b/...Tests/Infrastructure/NonSeekableStream.cs → ...Tests/Infrastructure/NonSeekableStream.cs
diff --git a/...ure/RequestBodyAsNonSeekableMiddleware.cs → ...ure/RequestBodyAsNonSeekableMiddleware.cs b/...ure/RequestBodyAsNonSeekableMiddleware.cs → ...ure/RequestBodyAsNonSeekableMiddleware.cs
diff --git a/...idata.MAuth.Tests/MAuthAspNetCoreTests.cs → ...h.AspNetCoreTests/MAuthAspNetCoreTests.cs b/...idata.MAuth.Tests/MAuthAspNetCoreTests.cs → ...h.AspNetCoreTests/MAuthAspNetCoreTests.cs