Skip to content

Commit dc55d7d

Browse files
WhathecodeWhathecode
committed
Converted to Visual Studio 2017 solution.
1 parent 9edec43 commit dc55d7d

File tree

10 files changed

+130
-67
lines changed

10 files changed

+130
-67
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ matrix:
55
- os: linux # Ubuntu 14.04
66
dist: trusty
77
sudo: required
8-
dotnet: 1.0.0-preview2-003121
8+
dotnet: 1.0.0-preview2-003131
99

1010
script:
11-
# Build the soruce
11+
# Build the source
1212
- cd src/Whathecode.System
1313
- dotnet restore
1414
- dotnet build
@@ -19,4 +19,4 @@ script:
1919
# Run tests
2020
- cd test/Whathecode.System.Tests
2121
- dotnet restore
22-
- dotnet test
22+
- dotnet test

‎NETStandard.Library.Extension.sln

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,65 @@
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.25928.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E95BAE83-DCB2-4D0C-9466-116BAE563A6B}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47D0D03B-5FCD-40DE-BE28-1BF2671E74FF}"
9-
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
11-
EndProjectSection
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4D8FF0CA-A47B-464C-A137-BD5B11FCECBD}"
129
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Whathecode.System", "src\Whathecode.System\Whathecode.System.xproj", "{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Whathecode.System", "src\Whathecode.System\Whathecode.System.csproj", "{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}"
1411
EndProject
15-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Whathecode.System (Tests)", "test\Whathecode.System.Tests\Whathecode.System (Tests).xproj", "{60F5C990-3DF2-4A33-8CF8-D83DCD5B322D}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Whathecode.System.Tests", "test\Whathecode.System.Tests\Whathecode.System.Tests.csproj", "{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}"
1613
EndProject
17-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4D8FF0CA-A47B-464C-A137-BD5B11FCECBD}"
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{588AAD04-5C01-4A63-9D52-9F6D342C345F}"
15+
ProjectSection(SolutionItems) = preProject
16+
.gitignore = .gitignore
17+
.travis.yml = .travis.yml
18+
global.json = global.json
19+
LICENSE = LICENSE
20+
README.md = README.md
21+
EndProjectSection
1822
EndProject
1923
Global
2024
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2125
Debug|Any CPU = Debug|Any CPU
26+
Debug|x64 = Debug|x64
27+
Debug|x86 = Debug|x86
2228
Release|Any CPU = Release|Any CPU
29+
Release|x64 = Release|x64
30+
Release|x86 = Release|x86
2331
EndGlobalSection
2432
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2533
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2634
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Debug|x64.ActiveCfg = Debug|Any CPU
36+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Debug|x64.Build.0 = Debug|Any CPU
37+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Debug|x86.ActiveCfg = Debug|Any CPU
38+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Debug|x86.Build.0 = Debug|Any CPU
2739
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Release|Any CPU.ActiveCfg = Release|Any CPU
2840
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{60F5C990-3DF2-4A33-8CF8-D83DCD5B322D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{60F5C990-3DF2-4A33-8CF8-D83DCD5B322D}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{60F5C990-3DF2-4A33-8CF8-D83DCD5B322D}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{60F5C990-3DF2-4A33-8CF8-D83DCD5B322D}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Release|x64.ActiveCfg = Debug|Any CPU
42+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Release|x64.Build.0 = Debug|Any CPU
43+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Release|x86.ActiveCfg = Debug|Any CPU
44+
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31}.Release|x86.Build.0 = Debug|Any CPU
45+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Debug|x64.ActiveCfg = Debug|Any CPU
48+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Debug|x64.Build.0 = Debug|Any CPU
49+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Debug|x86.ActiveCfg = Debug|Any CPU
50+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Debug|x86.Build.0 = Debug|Any CPU
51+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Release|x64.ActiveCfg = Release|Any CPU
54+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Release|x64.Build.0 = Release|Any CPU
55+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Release|x86.ActiveCfg = Release|Any CPU
56+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6}.Release|x86.Build.0 = Release|Any CPU
3357
EndGlobalSection
3458
GlobalSection(SolutionProperties) = preSolution
3559
HideSolutionNode = FALSE
3660
EndGlobalSection
3761
GlobalSection(NestedProjects) = preSolution
3862
{1C3067D6-A2ED-45DC-93B2-B7DBE0762E31} = {E95BAE83-DCB2-4D0C-9466-116BAE563A6B}
39-
{60F5C990-3DF2-4A33-8CF8-D83DCD5B322D} = {4D8FF0CA-A47B-464C-A137-BD5B11FCECBD}
63+
{8748C4A7-ADE9-442C-AEE8-ECF9DA0BC3D6} = {4D8FF0CA-A47B-464C-A137-BD5B11FCECBD}
4064
EndGlobalSection
4165
EndGlobal

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{
1+
{
22
"projects": [ "src", "test" ],
33
"sdk": {
44
"version": "1.0.0-preview2-003131"
55
}
6-
}
6+
}

‎src/Whathecode.System/Whathecode.System.csproj

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.6</TargetFramework>
5+
<AssemblyName>Whathecode.System</AssemblyName>
6+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
7+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
8+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
9+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="**\*.cs" />
13+
<EmbeddedResource Include="**\*.resx" />
14+
<EmbeddedResource Include="compiler\resources\**\*" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<Content Include="project.json" />
18+
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.NET.Sdk">
21+
<Version>1.0.0-alpha-20161104-2</Version>
22+
<PrivateAssets>All</PrivateAssets>
23+
</PackageReference>
24+
<PackageReference Include="NETStandard.Library">
25+
<Version>1.6.1</Version>
26+
</PackageReference>
27+
</ItemGroup>
28+
<ItemGroup />
29+
<PropertyGroup Label="Configuration">
30+
<OutputPath>
31+
</OutputPath>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
34+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
35+
</PropertyGroup>
36+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
37+
</Project>

‎src/Whathecode.System/Whathecode.System.xproj

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

‎src/Whathecode.System/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"imports": "dnxcore50"
1111
}
1212
}
13-
}
13+
}

‎test/Whathecode.System.Tests/Whathecode.System (Tests).xproj

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

‎test/Whathecode.System.Tests/Whathecode.System.Tests.csproj

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3+
<PropertyGroup Label="Configuration">
4+
<OutputPath>
5+
</OutputPath>
6+
</PropertyGroup>
7+
<PropertyGroup>
8+
<OutputType>Exe</OutputType>
9+
<TargetFramework>netcoreapp1.0</TargetFramework>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="**\*.cs" />
13+
<EmbeddedResource Include="**\*.resx" />
14+
</ItemGroup>
15+
<ItemGroup>
16+
<Content Include="project.json" />
17+
<Content Include="xunit.runner.json">
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</Content>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.NETCore.App">
23+
<Version>1.0.1</Version>
24+
</PackageReference>
25+
<PackageReference Include="Microsoft.NET.Sdk">
26+
<Version>1.0.0-alpha-20161104-2</Version>
27+
<PrivateAssets>All</PrivateAssets>
28+
</PackageReference>
29+
<PackageReference Include="Microsoft.NET.Test.Sdk">
30+
<Version>15.0.0-preview-20161123-03</Version>
31+
</PackageReference>
32+
<PackageReference Include="xunit">
33+
<Version>2.2.0-beta4-build3444</Version>
34+
</PackageReference>
35+
<PackageReference Include="xunit.runner.visualstudio">
36+
<Version>2.2.0-beta4-build1194</Version>
37+
</PackageReference>
38+
</ItemGroup>
39+
<ItemGroup>
40+
<ProjectReference Include="..\..\src\Whathecode.System\Whathecode.System.csproj" />
41+
</ItemGroup>
42+
<ItemGroup />
43+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
44+
</Project>

‎test/Whathecode.System.Tests/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"dependencies": {
1818
"Microsoft.NETCore.App": {
1919
"type": "platform",
20-
"version": "1.0.0"
20+
"version": "1.0.1"
2121
}
2222
}
2323
}
2424
}
25-
}
25+
}

‎test/Whathecode.System.Tests/xunit.runner.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{
2-
"methodDisplay": "Method"
3-
}
1+
{
2+
"methodDisplay": "method"
3+
}

0 commit comments

Comments
 (0)