Skip to content
This repository was archived by the owner on Oct 18, 2018. It is now read-only.

Commit ecbb52f

Browse files
davidfowldavidfowl
committed
Updated to use KoreBuild
- Updated solution file to use generated projects - Updated to use new test runner
1 parent 704239b commit ecbb52f

14 files changed

+176
-106
lines changed

Diff for: ‎.gitattributes

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
*.doc diff=astextplain
2+
*.DOC diff=astextplain
3+
*.docx diff=astextplain
4+
*.DOCX diff=astextplain
5+
*.dot diff=astextplain
6+
*.DOT diff=astextplain
7+
*.pdf diff=astextplain
8+
*.PDF diff=astextplain
9+
*.rtf diff=astextplain
10+
*.RTF diff=astextplain
11+
12+
*.jpg binary
13+
*.png binary
14+
*.gif binary
15+
16+
*.cs text=auto diff=csharp
17+
*.vb text=auto
18+
*.resx text=auto
19+
*.c text=auto
20+
*.cpp text=auto
21+
*.cxx text=auto
22+
*.h text=auto
23+
*.hxx text=auto
24+
*.py text=auto
25+
*.rb text=auto
26+
*.java text=auto
27+
*.html text=auto
28+
*.htm text=auto
29+
*.css text=auto
30+
*.scss text=auto
31+
*.sass text=auto
32+
*.less text=auto
33+
*.js text=auto
34+
*.lisp text=auto
35+
*.clj text=auto
36+
*.sql text=auto
37+
*.php text=auto
38+
*.lua text=auto
39+
*.m text=auto
40+
*.asm text=auto
41+
*.erl text=auto
42+
*.fs text=auto
43+
*.fsx text=auto
44+
*.hs text=auto
45+
46+
*.csproj text=auto
47+
*.vbproj text=auto
48+
*.fsproj text=auto
49+
*.dbproj text=auto
50+
*.sln text=auto eol=crlf

Diff for: ‎.gitignore

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
bin
2-
obj
3-
*.suo
1+
[Oo]bj/
2+
[Bb]in/
3+
TestResults/
4+
.nuget/
5+
_ReSharper.*/
6+
packages/
7+
artifacts/
8+
PublishProfiles/
49
*.user
10+
*.suo
11+
*.cache
12+
*.docstates
513
_ReSharper.*
6-
*.DS_Store
7-
*.userprefs
8-
*.pidb
9-
*.vspx
14+
nuget.exe
15+
*net45.csproj
16+
*k10.csproj
1017
*.psess
11-
TestResults/*
12-
TestResult.xml
13-
nugetkey
14-
packages
15-
target
16-
artifacts
17-
StyleCop.Cache
18-
node_modules
19-
*.snk
20-
.nuget/NuGet.exe
21-
docs/build
18+
*.vsp
19+
*.pidb
20+
*.userprefs
21+
*DS_Store
22+
*.ncrunchsolution
23+
*.*sdf
24+
*.ipch

Diff for: ‎NuGet.Config

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
5+
<add key="NuGet.org" value="https://nuget.org/api/v2/" />
6+
</packageSources>
7+
<packageSourceCredentials>
8+
<AspNetVNext>
9+
<add key="Username" value="aspnetreadonly" />
10+
<add key="ClearTextPassword" value="4d8a2d9c-7b80-4162-9978-47e918c9658c" />
11+
</AspNetVNext>
12+
</packageSourceCredentials>
13+
</configuration>

Diff for: ‎WebSockets.sln

+25-13
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30203.2
4+
VisualStudioVersion = 12.0.30313.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.WebSockets", "src\Microsoft.Net.WebSockets\Microsoft.Net.WebSockets.csproj", "{6C1D09CA-F799-44AE-8EC8-9D19C76080C1}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.WebSockets.Test", "test\Microsoft.Net.WebSockets.Test\Microsoft.Net.WebSockets.Test.csproj", "{EF1FE910-6E0C-4DE8-8CC1-6118B726A59E}"
9-
EndProject
106
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "test\TestClient\TestClient.csproj", "{22AB02E0-0346-4C4B-BBE7-C829A8D1C19E}"
117
EndProject
128
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "test\TestServer\TestServer.csproj", "{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}"
139
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C7947A5-9FBD-4267-97C1-2D726D7B3BAF}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C45106D0-76C8-4776-A140-F7DD83CA2958}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9E55FC5B-FD9C-4266-AB24-F3AA649D7C8B}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.WebSockets.net45", "src\Microsoft.Net.WebSockets\Microsoft.Net.WebSockets.net45.csproj", "{B43D2069-9690-49B2-BA0C-9E8ACC32CB83}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.WebSockets.Test.net45", "test\Microsoft.Net.WebSockets.Test\Microsoft.Net.WebSockets.Test.net45.csproj", "{DA755E15-86B8-4E9C-A3B0-B2D95E3646B5}"
19+
EndProject
1420
Global
1521
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1622
Debug|Any CPU = Debug|Any CPU
1723
Release|Any CPU = Release|Any CPU
1824
EndGlobalSection
1925
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20-
{6C1D09CA-F799-44AE-8EC8-9D19C76080C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{6C1D09CA-F799-44AE-8EC8-9D19C76080C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{6C1D09CA-F799-44AE-8EC8-9D19C76080C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{6C1D09CA-F799-44AE-8EC8-9D19C76080C1}.Release|Any CPU.Build.0 = Release|Any CPU
24-
{EF1FE910-6E0C-4DE8-8CC1-6118B726A59E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{EF1FE910-6E0C-4DE8-8CC1-6118B726A59E}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{EF1FE910-6E0C-4DE8-8CC1-6118B726A59E}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{EF1FE910-6E0C-4DE8-8CC1-6118B726A59E}.Release|Any CPU.Build.0 = Release|Any CPU
2826
{22AB02E0-0346-4C4B-BBE7-C829A8D1C19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2927
{22AB02E0-0346-4C4B-BBE7-C829A8D1C19E}.Debug|Any CPU.Build.0 = Debug|Any CPU
3028
{22AB02E0-0346-4C4B-BBE7-C829A8D1C19E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,8 +31,22 @@ Global
3331
{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
3432
{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
3533
{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{B43D2069-9690-49B2-BA0C-9E8ACC32CB83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{B43D2069-9690-49B2-BA0C-9E8ACC32CB83}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{B43D2069-9690-49B2-BA0C-9E8ACC32CB83}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{B43D2069-9690-49B2-BA0C-9E8ACC32CB83}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{DA755E15-86B8-4E9C-A3B0-B2D95E3646B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{DA755E15-86B8-4E9C-A3B0-B2D95E3646B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{DA755E15-86B8-4E9C-A3B0-B2D95E3646B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{DA755E15-86B8-4E9C-A3B0-B2D95E3646B5}.Release|Any CPU.Build.0 = Release|Any CPU
3642
EndGlobalSection
3743
GlobalSection(SolutionProperties) = preSolution
3844
HideSolutionNode = FALSE
3945
EndGlobalSection
46+
GlobalSection(NestedProjects) = preSolution
47+
{22AB02E0-0346-4C4B-BBE7-C829A8D1C19E} = {9E55FC5B-FD9C-4266-AB24-F3AA649D7C8B}
48+
{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B} = {9E55FC5B-FD9C-4266-AB24-F3AA649D7C8B}
49+
{B43D2069-9690-49B2-BA0C-9E8ACC32CB83} = {2C7947A5-9FBD-4267-97C1-2D726D7B3BAF}
50+
{DA755E15-86B8-4E9C-A3B0-B2D95E3646B5} = {C45106D0-76C8-4776-A140-F7DD83CA2958}
51+
EndGlobalSection
4052
EndGlobal

Diff for: ‎build.cmd

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@echo off
2+
cd %~dp0
3+
4+
SETLOCAL
5+
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
6+
7+
IF EXIST %CACHED_NUGET% goto copynuget
8+
echo Downloading latest version of NuGet.exe...
9+
IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
10+
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'"
11+
12+
:copynuget
13+
IF EXIST .nuget\nuget.exe goto restore
14+
md .nuget
15+
copy %CACHED_NUGET% .nuget\nuget.exe > nul
16+
17+
:restore
18+
IF EXIST packages\KoreBuild goto run
19+
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
20+
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
21+
22+
:run
23+
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

Diff for: ‎global.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"sources": ["src"]
3+
}

Diff for: ‎makefile.shade

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
var VERSION='0.1'
3+
var FULL_VERSION='0.1'
4+
var AUTHORS='Microsoft'
5+
6+
use-standard-lifecycle
7+
k-standard-goals

Diff for: ‎src/Microsoft.Net.WebSockets/Microsoft.Net.WebSockets.csproj

-57
This file was deleted.

Diff for: ‎src/Microsoft.Net.WebSockets/project.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "0.1-alpha-*",
3+
"configurations": {
4+
"net45": { }
5+
}
6+
}

Diff for: ‎test/Microsoft.Net.WebSockets.Test/Microsoft.Net.WebSockets.Test.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
<Compile Include="WebSocketClientTests.cs" />
5353
<Compile Include="Properties\AssemblyInfo.cs" />
5454
</ItemGroup>
55-
<ItemGroup>
56-
<ProjectReference Include="..\..\src\Microsoft.Net.WebSockets\Microsoft.Net.WebSockets.csproj">
57-
<Project>{6c1d09ca-f799-44ae-8ec8-9d19c76080c1}</Project>
58-
<Name>Microsoft.Net.WebSockets</Name>
59-
</ProjectReference>
60-
</ItemGroup>
6155
<ItemGroup>
6256
<None Include="packages.config" />
6357
</ItemGroup>

Diff for: ‎test/Microsoft.Net.WebSockets.Test/packages.config

-5
This file was deleted.

Diff for: ‎test/Microsoft.Net.WebSockets.Test/project.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"dependencies": {
3+
"Microsoft.Net.WebSockets": "",
4+
"Xunit.KRunner": "0.1-alpha-*",
5+
"xunit.abstractions": "2.0.0-aspnet-*",
6+
"xunit.assert": "2.0.0-aspnet-*",
7+
"xunit.core": "2.0.0-aspnet-*",
8+
"xunit.execution": "2.0.0-aspnet-*"
9+
},
10+
"configurations": {
11+
"net45": {
12+
"dependencies": {
13+
"System.Runtime" : ""
14+
}
15+
}
16+
},
17+
"commands": {
18+
"test": "Xunit.KRunner"
19+
}
20+
}

Diff for: ‎test/TestClient/App.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
55
</startup>
6-
</configuration>
6+
</configuration>

Diff for: ‎test/TestClient/TestClient.csproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>TestClient</RootNamespace>
1111
<AssemblyName>TestClient</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,9 +49,9 @@
4849
<None Include="App.config" />
4950
</ItemGroup>
5051
<ItemGroup>
51-
<ProjectReference Include="..\..\src\Microsoft.Net.WebSockets\Microsoft.Net.WebSockets.csproj">
52-
<Project>{6c1d09ca-f799-44ae-8ec8-9d19c76080c1}</Project>
53-
<Name>Microsoft.Net.WebSockets</Name>
52+
<ProjectReference Include="..\..\src\Microsoft.Net.WebSockets\Microsoft.Net.WebSockets.net45.csproj">
53+
<Project>{b43d2069-9690-49b2-ba0c-9e8acc32cb83}</Project>
54+
<Name>Microsoft.Net.WebSockets.net45</Name>
5455
</ProjectReference>
5556
</ItemGroup>
5657
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

0 commit comments

Comments
 (0)