Skip to content

Commit 075d574

Browse files
lschreck-mdsollschreck-mdsol
authored
[MCC-772940] Reorganize for compatibility (#82)
1 parent 158f171 commit 075d574

File tree

63 files changed

+254
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+254
-234
lines changed

‎.github/workflows/publish.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ jobs:
1313
submodules: 'recursive'
1414
- name: Build the packages
1515
run: dotnet build --configuration Release /p:PackageOutputPath=$GITHUB_WORKSPACE/artifacts
16-
- name: Run the tests
17-
run: dotnet test $GITHUB_WORKSPACE/Medidata.MAuth.sln --framework net5.0
1816
- name: Publish the packages
1917
run: dotnet nuget push "$GITHUB_WORKSPACE/artifacts/*.nupkg" --source $ARTIFACTORY_PUSH_TARGET --api-key $API_KEY
2018
env:
21-
API_KEY: ${{ format('{0}:{1}', secrets.ARTIFACTORY_USERNAME, secrets.ARTIFACTORY_PASSWORD) }}
19+
API_KEY: ${{ format('{0}:{1}', secrets.ARTIFACTORY_USERNAME, secrets.ARTIFACTORY_API_KEY) }}
2220
ARTIFACTORY_PUSH_TARGET: https://mdsol.jfrog.io/artifactory/api/nuget/nuget-local/mauth-client-dotnet

‎.github/workflows/test-net461.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Build and Test (.NET Framework 4.6.1)
2+
on: [push]
3+
jobs:
4+
Test:
5+
runs-on: windows-latest
6+
steps:
7+
- name: Check out repository
8+
uses: actions/checkout@v2
9+
with:
10+
submodules: 'recursive'
11+
- name: Run the Core tests
12+
run: dotnet test $env:GITHUB_WORKSPACE\tests\Medidata.MAuth.CoreTests --framework net461
13+
- name: Run the OWIN tests
14+
run: dotnet test $env:GITHUB_WORKSPACE\tests\Medidata.MAuth.OwinTests --framework net461
15+
- name: Run the WebAPI tests
16+
run: dotnet test $env:GITHUB_WORKSPACE\tests\Medidata.MAuth.WebApiTests --framework net461
17+

‎.github/workflows/test-net50.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Build and Test (.NET 5.0)
2+
on: [push]
3+
jobs:
4+
Test:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- name: Check out repository
8+
uses: actions/checkout@v2
9+
with:
10+
submodules: 'recursive'
11+
- name: Run the Core tests
12+
run: dotnet test $GITHUB_WORKSPACE/tests/Medidata.MAuth.CoreTests --framework net5.0
13+
- name: Run the ASP.NET Core tests
14+
run: dotnet test $GITHUB_WORKSPACE/tests/Medidata.MAuth.AspNetCoreTests --framework net5.0

‎.github/workflows/test.yaml

-12
This file was deleted.

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changes in Medidata.MAuth
22

3+
## v5.1.3
4+
- **[All]** Partially removed target framework multitargeting and specified single target framework for most of the
5+
packages
6+
- **[Core]** Specified target framework as .NET Standard 2.0 and .NET 5.0
7+
- **[AspNetCore]** Specified target framework as .NET Standard 2.0
8+
- **[Owin]** Specified target framework as .NET Framework 4.6.1
9+
- **[WebApi]** Specified target framework as .NET Framework 4.6.1
10+
311
## v5.1.2
412
- **[Core]** Removed unnecessary dependency on `System.Net.Http` package.
513

‎Medidata.MAuth.sln

+39-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A4336AA-6F7
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B74DB39B-4FB3-4DB1-A9BF-526413E8040B}"
99
ProjectSection(SolutionItems) = preProject
10-
appveyor.yml = appveyor.yml
1110
CHANGELOG.md = CHANGELOG.md
1211
LICENSE.md = LICENSE.md
1312
README.md = README.md
@@ -17,20 +16,27 @@ EndProject
1716
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Core", "src\Medidata.MAuth.Core\Medidata.MAuth.Core.csproj", "{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}"
1817
EndProject
1918
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9ED6F311-EB68-440E-A178-5C5F140F2340}"
20-
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Tests", "tests\Medidata.MAuth.Tests\Medidata.MAuth.Tests.csproj", "{A1940D71-52B3-42EC-B2DF-70782AFFF23C}"
19+
ProjectSection(SolutionItems) = preProject
20+
tests\Directory.Build.props = tests\Directory.Build.props
21+
tests\Medidata.MAuth.AspNetCoreTests\xunit.runner.json = tests\Medidata.MAuth.AspNetCoreTests\xunit.runner.json
22+
EndProjectSection
2223
EndProject
2324
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.Owin", "src\Medidata.MAuth.Owin\Medidata.MAuth.Owin.csproj", "{74308221-D7A5-4C15-86D2-62871655C24B}"
2425
EndProject
2526
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.WebApi", "src\Medidata.MAuth.WebApi\Medidata.MAuth.WebApi.csproj", "{E557F648-6FE1-432E-A8D7-BD00C18E5176}"
2627
EndProject
27-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F8B8C2CD-CBAE-42A5-A5FF-2A26E5275941}"
28-
ProjectSection(SolutionItems) = preProject
29-
build\build.ps1 = build\build.ps1
30-
EndProjectSection
31-
EndProject
3228
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.AspNetCore", "src\Medidata.MAuth.AspNetCore\Medidata.MAuth.AspNetCore.csproj", "{1BC50789-3BAE-4D87-B89C-C2658BFF6522}"
3329
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.OwinTests", "tests\Medidata.MAuth.OwinTests\Medidata.MAuth.OwinTests.csproj", "{40559440-D817-4A5A-8712-93E7E1B3868E}"
31+
EndProject
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.WebApiTests", "tests\Medidata.MAuth.WebApiTests\Medidata.MAuth.WebApiTests.csproj", "{C45178A0-AC69-4439-8C6D-448245051AF1}"
33+
EndProject
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.CoreTests", "tests\Medidata.MAuth.CoreTests\Medidata.MAuth.CoreTests.csproj", "{CBAEE752-2B48-405D-96B6-9893DB1BDB30}"
35+
EndProject
36+
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}"
37+
EndProject
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Medidata.MAuth.AspNetCoreTests", "tests\Medidata.MAuth.AspNetCoreTests\Medidata.MAuth.AspNetCoreTests.csproj", "{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}"
39+
EndProject
3440
Global
3541
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3642
Debug|Any CPU = Debug|Any CPU
@@ -41,10 +47,6 @@ Global
4147
{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
4248
{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
4349
{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{A1940D71-52B3-42EC-B2DF-70782AFFF23C}.Release|Any CPU.Build.0 = Release|Any CPU
4850
{74308221-D7A5-4C15-86D2-62871655C24B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4951
{74308221-D7A5-4C15-86D2-62871655C24B}.Debug|Any CPU.Build.0 = Debug|Any CPU
5052
{74308221-D7A5-4C15-86D2-62871655C24B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,16 +59,40 @@ Global
5759
{1BC50789-3BAE-4D87-B89C-C2658BFF6522}.Debug|Any CPU.Build.0 = Debug|Any CPU
5860
{1BC50789-3BAE-4D87-B89C-C2658BFF6522}.Release|Any CPU.ActiveCfg = Release|Any CPU
5961
{1BC50789-3BAE-4D87-B89C-C2658BFF6522}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{40559440-D817-4A5A-8712-93E7E1B3868E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{40559440-D817-4A5A-8712-93E7E1B3868E}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{40559440-D817-4A5A-8712-93E7E1B3868E}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{40559440-D817-4A5A-8712-93E7E1B3868E}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{C45178A0-AC69-4439-8C6D-448245051AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{C45178A0-AC69-4439-8C6D-448245051AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{C45178A0-AC69-4439-8C6D-448245051AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{C45178A0-AC69-4439-8C6D-448245051AF1}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{CBAEE752-2B48-405D-96B6-9893DB1BDB30}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{019393E9-6C95-4AA7-B7A2-D91B782A2A80}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B}.Release|Any CPU.Build.0 = Release|Any CPU
6082
EndGlobalSection
6183
GlobalSection(SolutionProperties) = preSolution
6284
HideSolutionNode = FALSE
6385
EndGlobalSection
6486
GlobalSection(NestedProjects) = preSolution
6587
{C9A9FECB-DB5B-40C3-B7CC-F0251853DDE6} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
66-
{A1940D71-52B3-42EC-B2DF-70782AFFF23C} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
6788
{74308221-D7A5-4C15-86D2-62871655C24B} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
6889
{E557F648-6FE1-432E-A8D7-BD00C18E5176} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
6990
{1BC50789-3BAE-4D87-B89C-C2658BFF6522} = {2A4336AA-6F7D-414B-AB2B-81A8F2E82A48}
91+
{40559440-D817-4A5A-8712-93E7E1B3868E} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
92+
{C45178A0-AC69-4439-8C6D-448245051AF1} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
93+
{CBAEE752-2B48-405D-96B6-9893DB1BDB30} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
94+
{019393E9-6C95-4AA7-B7A2-D91B782A2A80} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
95+
{D9608DB0-5C18-4C6A-95E2-FEB6F1C9D98B} = {9ED6F311-EB68-440E-A178-5C5F140F2340}
7096
EndGlobalSection
7197
GlobalSection(ExtensibilityGlobals) = postSolution
7298
SolutionGuid = {0A4D3258-5262-45FC-8A21-832CCBBB5878}

‎src/Medidata.MAuth.AspNetCore/Medidata.MAuth.AspNetCore.csproj

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
12+
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
1313
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1514
</PackageReference>
16-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
17-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
18-
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
15+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
16+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
1918
</ItemGroup>
2019

2120
<ItemGroup>

‎src/Medidata.MAuth.Core/HttpRequestMessageExtensions.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ public async static Task<byte[]> GetRequestContentAsBytesAsync(this HttpRequestM
1717
#if NET5_0
1818
public static byte[] GetRequestContentAsBytes(this HttpRequestMessage request)
1919
{
20-
using (var memoryStream = new MemoryStream())
20+
using var memoryStream = new MemoryStream();
21+
22+
if (request.Content != null)
2123
{
22-
if (request.Content != null)
23-
{
24-
request.Content.ReadAsStream().CopyTo(memoryStream);
25-
}
26-
return memoryStream.ToArray();
24+
request.Content.ReadAsStream().CopyTo(memoryStream);
2725
}
26+
return memoryStream.ToArray();
2827
}
2928
#endif
3029
}

‎src/Medidata.MAuth.Core/MAuthCore.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ internal byte[] GenerateSignature(HttpRequestMessage request, AuthenticationInfo
9797
}
9898

9999
/// <summary>
100-
/// Adds authentication information to a <see cref="HttpRequestMessage"/>.
100+
/// Adds authentication information to a <see cref="HttpRequestMessage"/>.
101101
/// </summary>
102102
/// <param name="request">The request to add the information to.</param>
103103
/// <param name="authInfo">
@@ -153,7 +153,7 @@ internal string CalculatePayload(HttpRequestMessage request, PrivateKeyAuthentic
153153
return (Constants.MAuthHeaderKey, Constants.MAuthTimeHeaderKey);
154154
}
155155

156-
#if NET5_0
156+
#if NET5_0
157157
public HttpRequestMessage SignSync(HttpRequestMessage request, MAuthSigningOptions options)
158158
{
159159
var authInfo = new PrivateKeyAuthenticationInfo()
@@ -166,8 +166,6 @@ public HttpRequestMessage SignSync(HttpRequestMessage request, MAuthSigningOptio
166166
var contents = request.GetRequestContentAsBytes();
167167
return AddAuthenticationInfo(request, authInfo, contents);
168168
}
169-
170169
#endif
171-
172170
}
173-
}
171+
}

‎src/Medidata.MAuth.Core/MAuthCoreV2.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ internal byte[] GenerateSignature(HttpRequestMessage request, AuthenticationInfo
106106
}
107107

108108
/// <summary>
109-
/// Adds authentication information to a <see cref="HttpRequestMessage"/>.
109+
/// Adds authentication information to a <see cref="HttpRequestMessage"/>.
110110
/// </summary>
111111
/// <param name="request">The request to add the information to.</param>
112112
/// <param name="authInfo">
@@ -148,7 +148,6 @@ internal HttpRequestMessage AddAuthenticationInfo(
148148
internal string CalculatePayload(
149149
HttpRequestMessage request, PrivateKeyAuthenticationInfo authInfo, byte[] requestContents)
150150
{
151-
152151
var unsignedData = GenerateSignature(request, authInfo, requestContents);
153152
var signer = new RSACryptoServiceProvider();
154153
signer.PersistKeyInCsp = false;

‎src/Medidata.MAuth.Core/Medidata.MAuth.Core.csproj

+7-24
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,20 @@
33
<PropertyGroup>
44
<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>
55
<AssemblyTitle>Medidata.MAuth.Core</AssemblyTitle>
6-
<TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
77
<AssemblyName>Medidata.MAuth.Core</AssemblyName>
88
<PackageTags>medidata;mauth;hmac;authentication;core;httpclient;messagehandler</PackageTags>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
12+
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
1313
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1514
</PackageReference>
1615
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
17-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
18-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
19-
<PackageReference Include="System.ValueTuple" Version="4.3.1" />
20-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" />
16+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
18+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
19+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
20+
<PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
2121
</ItemGroup>
22-
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
24-
<PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
28-
<PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
29-
</ItemGroup>
30-
31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
32-
<PackageReference Include="BouncyCastle" Version="1.8.1" />
33-
<Reference Include="System.Net.Http" />
34-
<Reference Include="System.Net.Http.WebRequest" />
35-
<Reference Include="System" />
36-
<Reference Include="Microsoft.CSharp" />
37-
</ItemGroup>
38-
3922
</Project>

‎src/Medidata.MAuth.Core/Properties/AssemblyInfo.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
using System.Runtime.CompilerServices;
2-
using System.Runtime.InteropServices;
32

43
[assembly: InternalsVisibleTo("Medidata.MAuth.AspNetCore")]
54
[assembly: InternalsVisibleTo("Medidata.MAuth.Owin")]
65
[assembly: InternalsVisibleTo("Medidata.MAuth.WebApi")]
7-
[assembly: InternalsVisibleTo("Medidata.Mauth.Tests")]
6+
[assembly: InternalsVisibleTo("Medidata.Mauth.Tests.Common")]
7+
[assembly: InternalsVisibleTo("Medidata.MAuth.CoreTests")]
8+
[assembly: InternalsVisibleTo("Medidata.MAuth.AspNetCoreTests")]
9+
[assembly: InternalsVisibleTo("Medidata.MAuth.OwinTests")]
10+
[assembly: InternalsVisibleTo("Medidata.MAuth.WebApiTests")]

‎src/Medidata.MAuth.Owin/Medidata.MAuth.Owin.csproj

+3-11
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
12+
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
1313
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1514
</PackageReference>
1615
</ItemGroup>
1716

1817
<ItemGroup>
1918
<ProjectReference Include="..\Medidata.MAuth.Core\Medidata.MAuth.Core.csproj" />
2019
</ItemGroup>
2120

22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
23-
<PackageReference Include="Owin" Version="1.0.0" />
24-
<PackageReference Include="Microsoft.Owin" Version="3.1.0" />
25-
<Reference Include="System" />
26-
<Reference Include="Microsoft.CSharp" />
27-
</ItemGroup>
28-
2921
<ItemGroup>
30-
<Reference Include="System.Net.Http" />
22+
<PackageReference Include="Owin" Version="1.0.0" />
23+
<PackageReference Include="Microsoft.Owin" Version="4.2.0" />
3124
</ItemGroup>
32-
3325
</Project>

‎src/Medidata.MAuth.WebApi/Medidata.MAuth.WebApi.csproj

+1-12
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0">
12+
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
1313
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1514
</PackageReference>
1615
</ItemGroup>
1716

1817
<ItemGroup>
1918
<ProjectReference Include="..\Medidata.MAuth.Core\Medidata.MAuth.Core.csproj" />
2019
</ItemGroup>
21-
22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
23-
<Reference Include="System" />
24-
<Reference Include="Microsoft.CSharp" />
25-
</ItemGroup>
26-
27-
<ItemGroup>
28-
<Reference Include="System.Net.Http" />
29-
</ItemGroup>
30-
3120
</Project>

‎tests/Directory.Build.props

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<Project>
4+
<PropertyGroup>
5+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
6+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<None Update="xunit.runner.json">
11+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12+
</None>
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
17+
<PackageReference Include="Moq" Version="4.16.1" />
18+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
19+
<PackageReference Include="xunit" Version="2.4.1" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
</ItemGroup>
25+
</Project>

‎tests/Medidata.MAuth.Tests/Infrastructure/NonSeekableStream.cs ‎tests/Medidata.MAuth.AspNetCoreTests/Infrastructure/NonSeekableStream.cs

File renamed without changes.

‎tests/Medidata.MAuth.Tests/Infrastructure/RequestBodyAsNonSeekableMiddleware.cs ‎tests/Medidata.MAuth.AspNetCoreTests/Infrastructure/RequestBodyAsNonSeekableMiddleware.cs

File renamed without changes.

‎tests/Medidata.MAuth.Tests/MAuthAspNetCoreTests.cs ‎tests/Medidata.MAuth.AspNetCoreTests/MAuthAspNetCoreTests.cs

File renamed without changes.

0 commit comments

Comments
 (0)