Skip to content
This repository was archived by the owner on Dec 24, 2020. It is now read-only.

Commit 874e718

Browse files
kevinchaletkevinchalet
committed
Incorporate the changes committed in the release branch
2 parents bd41e8e + 1747de8 commit 874e718

File tree

16 files changed

+47
-72
lines changed

16 files changed

+47
-72
lines changed

‎src/AspNet.Security.OAuth.Introspection/AspNet.Security.OAuth.Introspection.xproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>a8569260-142c-427a-8b14-a8df56cc15b7</ProjectGuid>
1010
<RootNamespace>AspNet.Security.OAuth.Introspection</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1313
</PropertyGroup>
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>
17-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
17+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
1818
</Project>

‎src/AspNet.Security.OAuth.Introspection/project.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,14 @@
3131
},
3232

3333
"dependencies": {
34-
"JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" },
34+
"JetBrains.Annotations": { "type": "build", "version": "10.1.4" },
3535
"Microsoft.AspNetCore.Authentication": "1.0.0-*",
3636
"Microsoft.Extensions.Caching.Abstractions": "1.0.0-*",
3737
"Newtonsoft.Json": "8.0.3"
3838
},
3939

4040
"frameworks": {
41-
"net451": {
42-
"frameworkAssemblies": {
43-
"System.ComponentModel": { "type": "build" },
44-
"System.Runtime": { "type": "build" },
45-
"System.Threading.Tasks": { "type": "build" }
46-
}
47-
},
41+
"net451": { },
4842

4943
"netstandard1.3": {
5044
"dependencies": {

‎src/AspNet.Security.OAuth.Validation/AspNet.Security.OAuth.Validation.xproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
8-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
98
<PropertyGroup Label="Globals">
109
<ProjectGuid>043fd757-9c69-4a68-93bf-ead2672bbd78</ProjectGuid>
1110
<RootNamespace>AspNet.Security.OAuth.Validation</RootNamespace>
12-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
13-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1413
</PropertyGroup>
15-
1614
<PropertyGroup>
1715
<SchemaVersion>2.0</SchemaVersion>
1816
</PropertyGroup>
19-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
20-
</Project>
17+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
18+
</Project>

‎src/AspNet.Security.OAuth.Validation/project.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,12 @@
3131
},
3232

3333
"dependencies": {
34-
"JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" },
34+
"JetBrains.Annotations": { "type": "build", "version": "10.1.4" },
3535
"Microsoft.AspNetCore.Authentication": "1.0.0-*"
3636
},
3737

3838
"frameworks": {
39-
"net451": {
40-
"frameworkAssemblies": {
41-
"System.Runtime": { "type": "build" }
42-
}
43-
},
39+
"net451": { },
4440

4541
"netstandard1.3": {
4642
"imports": [

‎src/Owin.Security.OAuth.Introspection/Owin.Security.OAuth.Introspection.xproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>f9031f69-74bf-4321-88d5-2a606d3da4e4</ProjectGuid>
1010
<RootNamespace>Owin.Security.OAuth.Introspection</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1313
</PropertyGroup>
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>
17-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
17+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
1818
</Project>

‎src/Owin.Security.OAuth.Introspection/project.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333

3434
"dependencies": {
35-
"JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" },
35+
"JetBrains.Annotations": { "type": "build", "version": "10.1.4" },
3636
"Microsoft.Extensions.Caching.Memory": "1.0.0-*",
3737
"Microsoft.Extensions.Logging": "1.0.0-*",
3838
"Microsoft.Owin.Security.Interop": "1.0.0-*",
@@ -42,10 +42,7 @@
4242
"frameworks": {
4343
"net451": {
4444
"frameworkAssemblies": {
45-
"System.ComponentModel": { "type": "build" },
46-
"System.Net.Http": "4.0.0.0",
47-
"System.Runtime": { "type": "build" },
48-
"System.Threading.Tasks": { "type": "build" }
45+
"System.Net.Http": "4.0.0.0"
4946
}
5047
}
5148
}

‎src/Owin.Security.OAuth.Validation/Owin.Security.OAuth.Validation.xproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>719af040-773b-4da5-b53e-28b26d1121ff</ProjectGuid>
1010
<RootNamespace>Owin.Security.OAuth.Validation</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1313
</PropertyGroup>
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>
17-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
17+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
1818
</Project>

‎src/Owin.Security.OAuth.Validation/project.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,15 @@
3232
},
3333

3434
"dependencies": {
35-
"JetBrains.Annotations": { "type": "build", "version": "10.1.2-eap" },
35+
"JetBrains.Annotations": { "type": "build", "version": "10.1.4" },
3636
"Microsoft.Extensions.Logging": "1.0.0-*",
3737
"Microsoft.Owin.Security.Interop": "1.0.0-*"
3838
},
3939

4040
"frameworks": {
4141
"net451": {
4242
"frameworkAssemblies": {
43-
"System.ComponentModel": { "type": "build" },
44-
"System.IdentityModel": "4.0.0.0",
45-
"System.Runtime": { "type": "build" }
43+
"System.IdentityModel": "4.0.0.0"
4644
}
4745
}
4846
}

‎test/AspNet.Security.OAuth.Introspection.Tests/AspNet.Security.OAuth.Introspection.Tests.xproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>4070dc46-0fd5-4add-95b3-e9908ad82407</ProjectGuid>
1010
<RootNamespace>AspNet.Security.OAuth.Introspection.Tests</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1313
</PropertyGroup>
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
1919
</ItemGroup>
20-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
2121
</Project>

‎test/AspNet.Security.OAuth.Introspection.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55

66
"dependencies": {
7-
"AspNet.Security.OAuth.Introspection": "1.0.0-*",
7+
"AspNet.Security.OAuth.Introspection": { "target": "project" },
88
"dotnet-test-xunit": "1.0.0-*",
99
"Microsoft.AspNetCore.TestHost": "1.0.0-*",
1010
"Microsoft.Extensions.Caching.Memory": "1.0.0-*",

0 commit comments

Comments
 (0)