Skip to content

Commit 8fb6a42

Browse files
kjnilssonkjnilsson
authored
Merge pull request #248 from bording/vs-support
Add Visual Studio support to master branch
2 parents 63022f5 + 049c438 commit 8fb6a42

File tree

62 files changed

+768
-8597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+768
-8597
lines changed

‎.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
## Generated files
33
###################
44

5-
gensrc/*dll*
6-
gensrc/*exe*
7-
gensrc/RabbitMQ.Client.WinRT/*
5+
gensrc/
86
[Ll]ocal.props
97
[Ll]ocal.dist
108

@@ -50,6 +48,9 @@ build/
5048
[Oo]bj/
5149
*.lock.json
5250

51+
# Visual Studio 2015 cache/options directory
52+
.vs/
53+
5354
# Visual Studio profiler
5455
*.psess
5556
*.vsp

‎RabbitMQ.ServiceModel.nuspec

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

‎RabbitMQDotNetClient.sln

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,87 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{068D7DC3-8E6E-4951-B9E3-272C641BF0DE}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}"
99
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{9093855F-C802-407D-B127-CADD8F92FCD8}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.ApigenBootstrap", "projects\client\ApigenBootstrap\RabbitMQ.Client.ApigenBootstrap.csproj", "{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Apigen", "projects\client\Apigen\RabbitMQ.Client.Apigen.csproj", "{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.WinRT", "projects\client\RabbitMQ.Client.WinRT\RabbitMQ.Client.WinRT.csproj", "{61D29F90-5B1C-4748-89FC-9FD2937F09C6}"
1511
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{71713FDD-D5EC-40B2-A924-76F80AD57E12}"
17-
ProjectSection(ProjectDependencies) = postProject
18-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45} = {9E8B8DC5-3837-46E9-90D7-8391CC62AB45}
19-
EndProjectSection
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Unit.WinRT", "projects\client\Unit.WinRT\RabbitMQ.Client.Unit.WinRT.csproj", "{897505A9-8373-4F41-8DE8-221BF06D877D}"
2013
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Unit", "projects\client\Unit\RabbitMQ.Client.Unit.csproj", "{DC9022AA-DC30-4871-AD28-3F166E05DBB5}"
14+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.xproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
2215
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.ServiceModel", "projects\wcf\RabbitMQ.ServiceModel\RabbitMQ.ServiceModel.csproj", "{5117232B-EE07-46F8-8AF5-2B636F1DBF56}"
16+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Unit", "projects\client\Unit\Unit.xproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
2417
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.WinRT", "projects\client\RabbitMQ.Client.WinRT\RabbitMQ.Client.WinRT.csproj", "{61D29F90-5B1C-4748-89FC-9FD2937F09C6}"
26-
ProjectSection(ProjectDependencies) = postProject
27-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45} = {9E8B8DC5-3837-46E9-90D7-8391CC62AB45}
28-
{71713FDD-D5EC-40B2-A924-76F80AD57E12} = {71713FDD-D5EC-40B2-A924-76F80AD57E12}
29-
EndProjectSection
18+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ApigenBootstrap", "projects\client\ApigenBootstrap\ApigenBootstrap.xproj", "{9534956B-60D5-49BA-8179-1382D4E64349}"
3019
EndProject
31-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Unit.WinRT", "projects\client\Unit.WinRT\RabbitMQ.Client.Unit.WinRT.csproj", "{897505A9-8373-4F41-8DE8-221BF06D877D}"
20+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Apigen", "projects\client\Apigen\Apigen.xproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
3221
EndProject
3322
Global
3423
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3524
Debug|Any CPU = Debug|Any CPU
3625
DebugNoTest|Any CPU = DebugNoTest|Any CPU
3726
Release|Any CPU = Release|Any CPU
27+
SignedRelease|Any CPU = SignedRelease|Any CPU
3828
EndGlobalSection
3929
GlobalSection(ProjectConfigurationPlatforms) = postSolution
40-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
43-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
44-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}.Release|Any CPU.Build.0 = Release|Any CPU
46-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
49-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
50-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{71713FDD-D5EC-40B2-A924-76F80AD57E12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{71713FDD-D5EC-40B2-A924-76F80AD57E12}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{71713FDD-D5EC-40B2-A924-76F80AD57E12}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
55-
{71713FDD-D5EC-40B2-A924-76F80AD57E12}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
56-
{71713FDD-D5EC-40B2-A924-76F80AD57E12}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{71713FDD-D5EC-40B2-A924-76F80AD57E12}.Release|Any CPU.Build.0 = Release|Any CPU
58-
{DC9022AA-DC30-4871-AD28-3F166E05DBB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59-
{DC9022AA-DC30-4871-AD28-3F166E05DBB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{DC9022AA-DC30-4871-AD28-3F166E05DBB5}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
61-
{DC9022AA-DC30-4871-AD28-3F166E05DBB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
62-
{DC9022AA-DC30-4871-AD28-3F166E05DBB5}.Release|Any CPU.Build.0 = Release|Any CPU
63-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56}.Debug|Any CPU.Build.0 = Debug|Any CPU
65-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
66-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
67-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56}.Release|Any CPU.ActiveCfg = Release|Any CPU
68-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56}.Release|Any CPU.Build.0 = Release|Any CPU
6930
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7031
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
7132
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
7233
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
7334
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
7435
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
7537
{897505A9-8373-4F41-8DE8-221BF06D877D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7638
{897505A9-8373-4F41-8DE8-221BF06D877D}.Debug|Any CPU.Build.0 = Debug|Any CPU
7739
{897505A9-8373-4F41-8DE8-221BF06D877D}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
7840
{897505A9-8373-4F41-8DE8-221BF06D877D}.Release|Any CPU.ActiveCfg = Release|Any CPU
7941
{897505A9-8373-4F41-8DE8-221BF06D877D}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{897505A9-8373-4F41-8DE8-221BF06D877D}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
43+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
45+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
46+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
47+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.ActiveCfg = SignedRelease|Any CPU
50+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.Build.0 = SignedRelease|Any CPU
51+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
54+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
57+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
58+
{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
61+
{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
62+
{9534956B-60D5-49BA-8179-1382D4E64349}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{9534956B-60D5-49BA-8179-1382D4E64349}.Release|Any CPU.Build.0 = Release|Any CPU
64+
{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
65+
{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
66+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
69+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
70+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
71+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.Build.0 = Release|Any CPU
72+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
73+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
8074
EndGlobalSection
8175
GlobalSection(SolutionProperties) = preSolution
8276
HideSolutionNode = FALSE
8377
EndGlobalSection
8478
GlobalSection(NestedProjects) = preSolution
8579
{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
86-
{9093855F-C802-407D-B127-CADD8F92FCD8} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
87-
{CC8F4572-6730-4C4D-A0BB-15151E2A26AE} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
88-
{9E8B8DC5-3837-46E9-90D7-8391CC62AB45} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
89-
{71713FDD-D5EC-40B2-A924-76F80AD57E12} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
90-
{DC9022AA-DC30-4871-AD28-3F166E05DBB5} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
91-
{5117232B-EE07-46F8-8AF5-2B636F1DBF56} = {9093855F-C802-407D-B127-CADD8F92FCD8}
9280
{61D29F90-5B1C-4748-89FC-9FD2937F09C6} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
9381
{897505A9-8373-4F41-8DE8-221BF06D877D} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
82+
{8C554257-5ECC-45DB-873D-560BFBB74EC8} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
83+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
84+
{9534956B-60D5-49BA-8179-1382D4E64349} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
85+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
9486
EndGlobalSection
9587
EndGlobal

‎build.bat

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
@ECHO OFF
2-
.paket\paket.bootstrapper.exe
3-
.paket\paket.exe restore
4-
packages\FAKE\tools\FAKE.exe build.fsx GenerateApi
5-
6-
dotnet restore .\projects\client\RabbitMQ.Client
2+
dotnet restore
3+
dotnet run -p .\projects\client\Apigen --apiName:AMQP_0_9_1 .\docs\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
74
dotnet build .\projects\client\RabbitMQ.Client
5+
dotnet build .\projects\client\Unit

‎build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
SCRIPT=$0
66
SCRIPT_DIR=$(cd $(dirname "$SCRIPT") && pwd)
77

8-
dotnet restore $SCRIPT_DIR/projects/client/RabbitMQ.Client
8+
dotnet restore
9+
dotnet run -p $SCRIPT_DIR/projects/client/Apigen --apiName:AMQP_0_9_1 $SCRIPT_DIR/docs/specs/amqp0-9-1.stripped.xml $SCRIPT_DIR/gensrc/autogenerated-api-0-9-1.cs
910
dotnet build $SCRIPT_DIR/projects/client/RabbitMQ.Client
10-
dotnet restore $SCRIPT_DIR/projects/client/Unit
1111
dotnet build $SCRIPT_DIR/projects/client/Unit

0 commit comments

Comments
 (0)