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 bbe83be commit a4d726d
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 63 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,5 @@ FakesAssemblies/

# Visual Studio 6 workspace options file
*.opt

*.lock.json
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.Mvvm.Async\Debug\net46'
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.Mvvm.Async.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", "{D3644E3B-A755-4F8E-8211-E06B0F130C53}"
EndProject
Expand All @@ -14,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Mvvm.Async", "src\Nito.Mvvm.Async\Nito.Mvvm.Async.kproj", "{DF370AF0-2154-4F19-830E-E1B7D182B820}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nito.Mvvm.Async", "src\Nito.Mvvm.Async\Nito.Mvvm.Async.xproj", "{DF370AF0-2154-4F19-830E-E1B7D182B820}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.kproj", "{4199FA26-F9FF-4B06-BE59-F7F35D84B058}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTests", "test\UnitTests\UnitTests.xproj", "{4199FA26-F9FF-4B06-BE59-F7F35D84B058}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ environment:
secure: U8vpVdaIAWQFmqDfHb8nT0aDMUVqVf/w/CMlDVcp1f7zWVqRtNXwwKM/9+SJ/t6A
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>df370af0-2154-4f19-830e-e1b7d182b820</ProjectGuid>
<RootNamespace>Nito.Mvvm</RootNamespace>
Expand All @@ -23,5 +23,5 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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>
42 changes: 21 additions & 21 deletions src/Nito.Mvvm.Async/project.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"version": "1.0.0-alpha-2",
"authors": [ "Stephen Cleary" ],
"description": "Asynchronous helper types for MVVM applications.",
"dependencies": {
"System.ObjectModel": "4.0.10.0-beta-22605",
"Nito.Mvvm.Core": "1.0.0-alpha-*"
},
"version": "1.0.0-beta-1",
"authors": [ "Stephen Cleary" ],
"description": "Asynchronous helper types for MVVM applications.",
"dependencies": {
"Nito.Mvvm.Core": "1.0.0-beta-*",
"System.ObjectModel": "4.0.11-beta-23516",
"System.Runtime": "4.0.21-beta-23516",
"System.Threading.Tasks": "4.0.11-beta-23516"
},

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

"frameworks": {
"net46": {
"dependencies": {
}
},
"aspnetcore50": {
"dependencies": {
"System.Runtime": "4.0.20-beta-22523",
"System.Threading.Tasks": "4.0.10.0-beta-22605"
}
}
"frameworks": {
"net46": {
"dependencies": {
}
},
"netcore50": {
"dependencies": {
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@
<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>4199fa26-f9ff-4b06-be59-f7f35d84b058</ProjectGuid>
<RootNamespace>UnitTests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
45 changes: 20 additions & 25 deletions test/UnitTests/project.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
{
"version": "1.0.0-*",
"dependencies": {
"Nito.Mvvm.Async": "",
"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",
"System.Linq": "4.0.0.0-beta-22605",
"System.Linq.Expressions": "4.0.0.0-beta-22605"
},
"version": "1.0.0-*",
"dependencies": {
"Nito.Mvvm.Async": "",
"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",
"System.Linq": "4.0.1-beta-23516",
"System.Linq.Expressions": "4.0.11-beta-23516",
"System.Runtime": "4.0.21-beta-23516"
},

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

"frameworks": {
"net46": {
"dependencies": {
"System.Runtime": "4.0.20-beta-22523"
}
},
"aspnetcore50": {
"dependencies": {
"System.Runtime": "4.0.20-beta-22523"
}
}
"frameworks": {
"dnx46": {
"dependencies": {
}
}
}
}

0 comments on commit a4d726d

Please sign in to comment.