Skip to content

Commit 674080f

Browse files
Merge pull request #9 from MakingSense/both-vs
Migrate to VS2017
2 parents b7bd0dd + d3e6053 commit 674080f

File tree

7 files changed

+43
-80
lines changed

7 files changed

+43
-80
lines changed

MakingSense.AspNetCore.Authentication.SimpleToken.sln

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1A4906E1-3779-42B3-BE5D-2079B4D0C0C9}"
77
EndProject
@@ -11,13 +11,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
.gitattributes = .gitattributes
1212
.gitignore = .gitignore
1313
appveyor.yml = appveyor.yml
14-
global.json = global.json
1514
LICENSE = LICENSE
16-
NuGet.Config = NuGet.Config
1715
README.md = README.md
1816
EndProjectSection
1917
EndProject
20-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MakingSense.AspNetCore.Authentication.SimpleToken", "src\MakingSense.AspNetCore.Authentication.SimpleToken\MakingSense.AspNetCore.Authentication.SimpleToken.xproj", "{209CD8C9-0545-4A2E-826D-5B83044261AF}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MakingSense.AspNetCore.Authentication.SimpleToken", "src\MakingSense.AspNetCore.Authentication.SimpleToken\MakingSense.AspNetCore.Authentication.SimpleToken.csproj", "{209CD8C9-0545-4A2E-826D-5B83044261AF}"
2119
EndProject
2220
Global
2321
GlobalSection(SolutionConfigurationPlatforms) = preSolution

NuGet.Config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,5 @@
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
66
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
7-
<add key="aspnetrelease" value="https://www.myget.org/F/aspnetrelease/api/v3/index.json" />
8-
<add key="makingsense-aspnet" value="https://ci.appveyor.com/nuget/makingsense-aspnet" />
97
</packageSources>
10-
<packageSourceCredentials>
11-
<makingsense-aspnet>
12-
<add key="Username" value="[email protected]" />
13-
<add key="ClearTextPassword" value="4@pdw@BlfpQn" />
14-
</makingsense-aspnet>
15-
</packageSourceCredentials>
168
</configuration>

appveyor.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
os: Visual Studio 2015
1+
os: Visual Studio 2017
22

3-
version: 1.0.5-alpha-{build}
3+
version: 1.1.0-alpha-{build}
44

55
nuget:
6-
account_feed: true
76
project_feed: true
87

8+
install:
9+
- cmd: nuget sources add -Name makingsense-aspnet -Source https://ci.appveyor.com/nuget/makingsense-aspnet -UserName [email protected] -Password 4@pdw@BlfpQn
10+
911
before_build:
1012
- cmd: set DOTNET_ASSEMBLY_FILE_VERSION=%APPVEYOR_BUILD_NUMBER%
1113
- cmd: set DOTNET_BUILD_VERSION=%APPVEYOR_BUILD_NUMBER%

global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>MakingSense.AspNetCore.Authentication.SimpleToken Class Library</Description>
5+
<Authors>MakingSense</Authors>
6+
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
7+
<AssemblyName>MakingSense.AspNetCore.Authentication.SimpleToken</AssemblyName>
8+
<PackageId>MakingSense.AspNetCore.Authentication.SimpleToken</PackageId>
9+
<PackageTags>ASP.NET 5;vnext;authentication;token;bearer</PackageTags>
10+
<PackageProjectUrl>https://github.com/MakingSense/aspnet-authentication-simpletoken</PackageProjectUrl>
11+
<PackageLicenseUrl>http://www.gnu.org/licenses/lgpl.html</PackageLicenseUrl>
12+
<RepositoryType>git</RepositoryType>
13+
<RepositoryUrl>git://github.com/MakingSense/aspnet-authentication-simpletoken</RepositoryUrl>
14+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">1.1.1</RuntimeFrameworkVersion>
15+
<Version>1.1.0-alpha</Version>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="MakingSense.AspNetCore.Abstractions" Version="1.1.0-*" />
20+
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="1.1.1" />
21+
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
22+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.3" />
23+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
24+
<PackageReference Include="System.Linq" Version="4.3.0" />
25+
<PackageReference Include="System.Threading" Version="4.3.0" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
29+
<PackageReference Include="System.Collections" Version="4.3.0" />
30+
<PackageReference Include="System.Runtime" Version="4.3.0" />
31+
<Reference Include="System" />
32+
<Reference Include="Microsoft.CSharp" />
33+
</ItemGroup>
34+
35+
</Project>

src/MakingSense.AspNetCore.Authentication.SimpleToken/MakingSense.AspNetCore.Authentication.SimpleToken.xproj

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/MakingSense.AspNetCore.Authentication.SimpleToken/project.json

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)