Skip to content

Commit a4d726d

Browse files
StephenClearyStephenCleary
committed
Update to VS2015
1 parent bbe83be commit a4d726d

File tree

9 files changed

+63
-63
lines changed

9 files changed

+63
-63
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,5 @@ FakesAssemblies/
194194

195195
# Visual Studio 6 workspace options file
196196
*.opt
197+
198+
*.lock.json

‎Coverage.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
$artifactLocation = 'artifacts\bin\Nito.Mvvm.Async\Debug\net46'
2-
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/master/Coverage.ps1'))
2+
$testProjectLocation = 'test/UnitTests'
3+
$outputLocation = 'testResults'
4+
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/StephenCleary/BuildTools/bb636fc76a9017d3cee13d7229539007077845ef/Coverage.ps1'))

‎Nito.Mvvm.Async.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22609.0
4+
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D3644E3B-A755-4F8E-8211-E06B0F130C53}"
77
EndProject
@@ -14,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
global.json = global.json
1515
EndProjectSection
1616
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Mvvm.Async", "src\Nito.Mvvm.Async\Nito.Mvvm.Async.kproj", "{DF370AF0-2154-4F19-830E-E1B7D182B820}"
17+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Mvvm.Async", "src\Nito.Mvvm.Async\Nito.Mvvm.Async.xproj", "{DF370AF0-2154-4F19-830E-E1B7D182B820}"
1818
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.kproj", "{4199FA26-F9FF-4B06-BE59-F7F35D84B058}"
19+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.xproj", "{4199FA26-F9FF-4B06-BE59-F7F35D84B058}"
2020
EndProject
2121
Global
2222
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ environment:
66
secure: U8vpVdaIAWQFmqDfHb8nT0aDMUVqVf/w/CMlDVcp1f7zWVqRtNXwwKM/9+SJ/t6A
77
install:
88
- ps: >-
9-
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/master/kvminstall.ps1'))
9+
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))
1010
1111
$env:Path = "C:\Program Files (x86)\MSBuild\14.0\Bin;" + [Environment]::GetEnvironmentVariables("Machine")["Path"] + ";" + [Environment]::GetEnvironmentVariables("User")["Path"]
1212
13-
kvm upgrade
13+
dnvm install 1.0.0-rc1-update2
1414
before_build:
15-
- ps: kpm restore
15+
- ps: dnu restore
1616
build:
1717
verbosity: minimal
1818
test_script:

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"sources": [ "src", "test" ],
3-
"sdk": {
4-
"version": "1.0.0-beta3"
5-
}
2+
"projects": [ "src", "test" ],
3+
"sdk": {
4+
"version": "1.0.0-rc1-update2"
5+
}
66
}

‎src/Nito.Mvvm.Async/Nito.Mvvm.Async.kproj renamed to ‎src/Nito.Mvvm.Async/Nito.Mvvm.Async.xproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>df370af0-2154-4f19-830e-e1b7d182b820</ProjectGuid>
1010
<RootNamespace>Nito.Mvvm</RootNamespace>
@@ -23,5 +23,5 @@
2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2424
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
2525
</PropertyGroup>
26-
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
26+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
2727
</Project>

‎src/Nito.Mvvm.Async/project.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"version": "1.0.0-alpha-2",
3-
"authors": [ "Stephen Cleary" ],
4-
"description": "Asynchronous helper types for MVVM applications.",
5-
"dependencies": {
6-
"System.ObjectModel": "4.0.10.0-beta-22605",
7-
"Nito.Mvvm.Core": "1.0.0-alpha-*"
8-
},
2+
"version": "1.0.0-beta-1",
3+
"authors": [ "Stephen Cleary" ],
4+
"description": "Asynchronous helper types for MVVM applications.",
5+
"dependencies": {
6+
"Nito.Mvvm.Core": "1.0.0-beta-*",
7+
"System.ObjectModel": "4.0.11-beta-23516",
8+
"System.Runtime": "4.0.21-beta-23516",
9+
"System.Threading.Tasks": "4.0.11-beta-23516"
10+
},
911

10-
"compilationOptions": {
11-
"warningsAsErrors": true
12-
},
12+
"compilationOptions": {
13+
"warningsAsErrors": true
14+
},
1315

14-
"frameworks": {
15-
"net46": {
16-
"dependencies": {
17-
}
18-
},
19-
"aspnetcore50": {
20-
"dependencies": {
21-
"System.Runtime": "4.0.20-beta-22523",
22-
"System.Threading.Tasks": "4.0.10.0-beta-22605"
23-
}
24-
}
16+
"frameworks": {
17+
"net46": {
18+
"dependencies": {
19+
}
20+
},
21+
"netcore50": {
22+
"dependencies": {
23+
}
2524
}
25+
}
2626
}

‎test/UnitTests/UnitTests.kproj renamed to ‎test/UnitTests/UnitTests.xproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
8-
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
98
<PropertyGroup Label="Globals">
109
<ProjectGuid>4199fa26-f9ff-4b06-be59-f7f35d84b058</ProjectGuid>
1110
<RootNamespace>UnitTests</RootNamespace>
1211
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
1312
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
1413
</PropertyGroup>
15-
1614
<PropertyGroup>
1715
<SchemaVersion>2.0</SchemaVersion>
1816
</PropertyGroup>
19-
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
17+
<ItemGroup>
18+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
19+
</ItemGroup>
20+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
2021
</Project>

‎test/UnitTests/project.json

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
{
2-
"version": "1.0.0-*",
3-
"dependencies": {
4-
"Nito.Mvvm.Async": "",
5-
"xunit": "2.0.0.0-rc3-build2880",
6-
"xunit.runner.aspnet": "2.0.0.0-rc3-build52",
7-
"OpenCover": "4.5.3809-rc94",
8-
"coveralls.io": "1.3.2.0",
9-
"ReportGenerator": "2.1.4.0",
10-
"System.Linq": "4.0.0.0-beta-22605",
11-
"System.Linq.Expressions": "4.0.0.0-beta-22605"
12-
},
2+
"version": "1.0.0-*",
3+
"dependencies": {
4+
"Nito.Mvvm.Async": "",
5+
"xunit": "2.1.0",
6+
"xunit.runner.dnx": "2.1.0-rc1-build204",
7+
"ReportGenerator": "2.4.4",
8+
"coveralls.io": "1.3.4",
9+
"OpenCover": "4.6.519",
10+
"System.Linq": "4.0.1-beta-23516",
11+
"System.Linq.Expressions": "4.0.11-beta-23516",
12+
"System.Runtime": "4.0.21-beta-23516"
13+
},
1314

14-
"commands": {
15-
"test": "xunit.runner.aspnet"
16-
},
15+
"commands": {
16+
"test": "xunit.runner.dnx"
17+
},
1718

18-
"frameworks": {
19-
"net46": {
20-
"dependencies": {
21-
"System.Runtime": "4.0.20-beta-22523"
22-
}
23-
},
24-
"aspnetcore50": {
25-
"dependencies": {
26-
"System.Runtime": "4.0.20-beta-22523"
27-
}
28-
}
19+
"frameworks": {
20+
"dnx46": {
21+
"dependencies": {
22+
}
2923
}
24+
}
3025
}

0 commit comments

Comments
 (0)