Skip to content

Commit

Permalink
Update to VS2015.
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenCleary committed Apr 20, 2016
1 parent 452fa1b commit 8351be4
Show file tree
Hide file tree
Showing 10 changed files with 1,083 additions and 55 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,5 @@ UpgradeLog*.htm

# Microsoft Fakes
FakesAssemblies/

*.lock.json
1,030 changes: 1,030 additions & 0 deletions .vs/config/applicationhost.config

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Coverage.ps1
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$artifactLocation = 'artifacts\bin\Nito.Collections.Deque\Debug\net45'
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/master/Coverage.ps1'))
$testProjectLocation = 'test/UnitTests'
$outputLocation = 'testResults'
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/bb636fc76a9017d3cee13d7229539007077845ef/Coverage.ps1'))
6 changes: 3 additions & 3 deletions Nito.Collections.Deque.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22609.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC7CC3DD-D397-484C-80AD-D220DA2A26AA}"
EndProject
Expand All @@ -12,11 +12,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Collections.Deque", "src\Nito.Collections.Deque\Nito.Collections.Deque.kproj", "{83983561-B471-4D13-97C4-B0F37D50AD9B}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Collections.Deque", "src\Nito.Collections.Deque\Nito.Collections.Deque.xproj", "{83983561-B471-4D13-97C4-B0F37D50AD9B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D1E43B37-4C8F-4BC9-B3E1-19F7292F734B}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.kproj", "{3E065FC5-0244-4FA7-8F45-BFC57B439056}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.xproj", "{3E065FC5-0244-4FA7-8F45-BFC57B439056}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: '{build}'
os: Visual Studio 2015 CTP 6
os: Visual Studio 2015
configuration: Debug
environment:
COVERALLS_REPO_TOKEN:
secure: waESdN0qLkOHxENdd86z/W5nbDbadt6XNnwJLCd+d/tfpIJN9w6xRT7X+nev5cMa
install:
- ps: >-
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/master/kvminstall.ps1'))
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))
$env:Path = "C:\Program Files (x86)\MSBuild\14.0\Bin;" + [Environment]::GetEnvironmentVariables("Machine")["Path"] + ";" + [Environment]::GetEnvironmentVariables("User")["Path"]
kvm upgrade
dnvm install 1.0.0-rc1-update2
before_build:
- ps: kpm restore
- ps: dnu restore
build:
verbosity: minimal
test_script:
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sources": [ "src", "test" ],
"sdk": {
"version": "1.0.0-beta3"
}
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-rc1-update2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>83983561-b471-4d13-97c4-b0f37d50ad9b</ProjectGuid>
<RootNamespace>Nito.Collections</RootNamespace>
Expand All @@ -26,5 +26,5 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
33 changes: 16 additions & 17 deletions src/Nito.Collections.Deque/project.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{
"version": "1.0.0-alpha-2",
"authors": [ "Stephen Cleary" ],
"description": "A double-ended queue.",

"compilationOptions": {
"warningsAsErrors": true
},

"frameworks": {
"net45": { },
"aspnetcore50": {
"dependencies": {
"System.Runtime": "4.0.20-beta-22523",
"System.Diagnostics.Debug": "4.0.10.0-beta-22605",
"System.Collections": "4.0.10.0-beta-22605"
}
}
"version": "1.0.0-beta-1",
"authors": [ "Stephen Cleary" ],
"description": "A double-ended queue.",
"compilationOptions": {
"warningsAsErrors": true
},
"frameworks": {
"net45": { },
"netcore50": {
"dependencies": { }
}
},
"dependencies": {
"System.Collections": "4.0.11-beta-23516",
"System.Diagnostics.Debug": "4.0.11-beta-23516",
"System.Runtime": "4.0.21-beta-23516"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>3e065fc5-0244-4fa7-8f45-bfc57b439056</ProjectGuid>
<RootNamespace>UnitTests</RootNamespace>
Expand All @@ -17,5 +17,5 @@
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
39 changes: 17 additions & 22 deletions test/UnitTests/project.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
{
"version": "1.0.0-*",
"dependencies": {
"Nito.Collections.Deque": "",
"xunit": "2.0.0.0-rc3-build2880",
"xunit.runner.aspnet": "2.0.0.0-rc3-build52",
"OpenCover": "4.5.3809-rc94",
"coveralls.io": "1.3.2.0",
"ReportGenerator": "2.1.4.0"
},
"version": "1.0.0-*",
"dependencies": {
"Nito.Collections.Deque": "",
"xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-rc1-build204",
"ReportGenerator": "2.4.4",
"coveralls.io": "1.3.4",
"OpenCover": "4.6.519"
},

"commands": {
"test": "xunit.runner.aspnet"
},
"commands": {
"test": "xunit.runner.dnx"
},

"frameworks": {
"aspnet50": {
"dependencies": {
}
},
"aspnetcore50": {
"dependencies": {
"System.Runtime": "4.0.20-beta-22523"
}
}
"frameworks": {
"dnx451": {
"dependencies": {
}
}
}
}

0 comments on commit 8351be4

Please sign in to comment.