Skip to content

Commit a10dd70

Browse files
authored
Merge pull request #736 from rabbitmq/lrb-visual-studio-2019
Migrate to VS 2019 (mostly cosmetic)
2 parents 924aaf3 + 90fcac8 commit a10dd70

File tree

6 files changed

+122
-136
lines changed

6 files changed

+122
-136
lines changed

RabbitMQDotNetClient.sln

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.28307.1022
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29806.167
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{068D7DC3-8E6E-4951-B9E3-272C641BF0DE}"
66
EndProject
77
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}"
88
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
10-
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
12-
EndProject
13-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
14-
EndProject
159
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34486CC0-D61E-46BA-9E5E-6E8EFA7C34B5}"
1610
ProjectSection(SolutionItems) = preProject
1711
.editorconfig = .editorconfig
1812
Directory.Build.props = Directory.Build.props
1913
EndProjectSection
2014
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
16+
EndProject
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
18+
EndProject
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
20+
EndProject
2121
Global
2222
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2323
Debug|Any CPU = Debug|Any CPU

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform: Any CPU
44
configuration: Release
55
skip_tags: true
66
skip_branch_with_pr: true
7-
image: Visual Studio 2017
7+
image: Visual Studio 2019
88

99
environment:
1010
SNKSECRET:

projects/client/Apigen/Apigen.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>netcoreapp2.1</TargetFramework>
54
<AssemblyName>Apigen</AssemblyName>
@@ -12,9 +11,7 @@
1211
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1312
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
1413
</PropertyGroup>
15-
1614
<ItemGroup>
1715
<Compile Include="..\RabbitMQ.Client\src\client\api\AmqpTimestamp.cs;..\RabbitMQ.Client\src\client\api\IBasicConsumer.cs;..\RabbitMQ.Client\src\client\api\IBasicProperties.cs;..\RabbitMQ.Client\src\client\api\IContentHeader.cs;..\RabbitMQ.Client\src\client\api\IModel.cs;..\RabbitMQ.Client\src\client\api\PublicationAddress.cs;..\RabbitMQ.Client\src\client\api\IBasicPublishBatch.cs;..\RabbitMQ.Client\src\client\api\BasicGetResult.cs;..\RabbitMQ.Client\src\client\api\QueueDeclareOk.cs;..\RabbitMQ.Client\src\client\api\ShutdownEventArgs.cs;..\RabbitMQ.Client\src\client\api\ShutdownInitiator.cs;..\RabbitMQ.Client\src\client\events\BasicReturnEventArgs.cs;..\RabbitMQ.Client\src\client\events\BasicAckEventArgs.cs;..\RabbitMQ.Client\src\client\events\BasicNackEventArgs.cs;..\RabbitMQ.Client\src\client\events\CallbackExceptionEventArgs.cs;..\RabbitMQ.Client\src\client\events\ConsumerEventArgs.cs;..\RabbitMQ.Client\src\client\events\FlowControlEventArgs.cs;..\RabbitMQ.Client\src\client\impl\IFullModel.cs" />
1816
</ItemGroup>
19-
2017
</Project>

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,32 @@
2424
<IncludeSymbols>true</IncludeSymbols>
2525
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2626
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
27-
<LangVersion>latest</LangVersion>
2827
</PropertyGroup>
29-
3028
<ItemGroup>
3129
<Compile Remove="build\**\*" />
3230
<Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" Exclude="build\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
3331
</ItemGroup>
34-
3532
<ItemGroup>
3633
<None Include="icon.png">
3734
<Pack>True</Pack>
3835
<PackagePath></PackagePath>
3936
</None>
4037
</ItemGroup>
41-
4238
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
4339
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
4440
</PropertyGroup>
45-
4641
<PropertyGroup Condition=" '$(Configuration)' == 'SignedRelease' ">
4742
<DelaySign>true</DelaySign>
4843
<OutputType>Library</OutputType>
4944
<Optimize>true</Optimize>
5045
<AssemblyOriginatorKeyFile>../../../rabbit.snk</AssemblyOriginatorKeyFile>
5146
<SignAssembly>true</SignAssembly>
5247
</PropertyGroup>
53-
5448
<ItemGroup>
5549
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
56-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
50+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5751
<PackageReference Include="System.Memory" Version="4.5.3" />
5852
</ItemGroup>
59-
6053
<ItemGroup Condition=" '$(Configuration)' == 'SignedRelease' ">
6154
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
6255
<_Parameter1>Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
@@ -67,5 +60,4 @@
6760
<_Parameter1>Unit</_Parameter1>
6861
</AssemblyAttribute>
6962
</ItemGroup>
70-
7163
</Project>

projects/client/Unit/Unit.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
54
<AssemblyName>Unit</AssemblyName>
@@ -11,23 +10,18 @@
1110
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1211
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1312
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
14-
<LangVersion>latest</LangVersion>
1513
</PropertyGroup>
16-
1714
<ItemGroup>
1815
<ProjectReference Include="../RabbitMQ.Client/RabbitMQ.Client.csproj" />
1916
</ItemGroup>
20-
2117
<ItemGroup>
2218
<PackageReference Include="ApprovalTests" Version="4.4.0" />
2319
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
2420
<PackageReference Include="NUnit" Version="3.12.0" />
2521
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
2622
<PackageReference Include="PublicApiGenerator" Version="10.0.2" />
2723
</ItemGroup>
28-
2924
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
3025
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
3126
</PropertyGroup>
32-
3327
</Project>

projects/client/Unit/src/unit/TestPropertiesClone.cs

Lines changed: 112 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -45,132 +45,135 @@
4545
using RabbitMQ.Client;
4646
using RabbitMQ.Client.Impl;
4747

48-
[TestFixture]
49-
public class TestPropertiesClone
48+
namespace RabbitMQ.Client.Unit
5049
{
51-
[Test]
52-
public void TestBasicPropertiesCloneV0_9_1()
50+
[TestFixture]
51+
public class TestPropertiesClone
5352
{
54-
TestBasicPropertiesClone(new RabbitMQ.Client.Framing.BasicProperties());
55-
}
53+
[Test]
54+
public void TestBasicPropertiesCloneV0_9_1()
55+
{
56+
TestBasicPropertiesClone(new RabbitMQ.Client.Framing.BasicProperties());
57+
}
5658

57-
[Test]
58-
public void TestBasicPropertiesNoneCloneV0_9_1()
59-
{
60-
TestBasicPropertiesNoneClone(new RabbitMQ.Client.Framing.BasicProperties());
61-
}
59+
[Test]
60+
public void TestBasicPropertiesNoneCloneV0_9_1()
61+
{
62+
TestBasicPropertiesNoneClone(new RabbitMQ.Client.Framing.BasicProperties());
63+
}
6264

63-
private void TestBasicPropertiesClone(BasicProperties bp)
64-
{
65-
// Set initial values
66-
bp.ContentType = "foo_1";
67-
bp.ContentEncoding = "foo_2";
68-
bp.Headers = new Dictionary<string, object>
65+
private void TestBasicPropertiesClone(BasicProperties bp)
66+
{
67+
// Set initial values
68+
bp.ContentType = "foo_1";
69+
bp.ContentEncoding = "foo_2";
70+
bp.Headers = new Dictionary<string, object>
6971
{
7072
{ "foo_3", "foo_4" },
7173
{ "foo_5", "foo_6" }
7274
};
73-
bp.DeliveryMode = 2;
74-
// Persistent also changes DeliveryMode's value to 2
75-
bp.Persistent = true;
76-
bp.Priority = 12;
77-
bp.CorrelationId = "foo_7";
78-
bp.ReplyTo = "foo_8";
79-
bp.Expiration = "foo_9";
80-
bp.MessageId = "foo_10";
81-
bp.Timestamp = new AmqpTimestamp(123);
82-
bp.Type = "foo_11";
83-
bp.UserId = "foo_12";
84-
bp.AppId = "foo_13";
85-
bp.ClusterId = "foo_14";
75+
bp.DeliveryMode = 2;
76+
// Persistent also changes DeliveryMode's value to 2
77+
bp.Persistent = true;
78+
bp.Priority = 12;
79+
bp.CorrelationId = "foo_7";
80+
bp.ReplyTo = "foo_8";
81+
bp.Expiration = "foo_9";
82+
bp.MessageId = "foo_10";
83+
bp.Timestamp = new AmqpTimestamp(123);
84+
bp.Type = "foo_11";
85+
bp.UserId = "foo_12";
86+
bp.AppId = "foo_13";
87+
bp.ClusterId = "foo_14";
8688

87-
// Clone
88-
BasicProperties bpClone = bp.Clone() as BasicProperties;
89+
// Clone
90+
BasicProperties bpClone = bp.Clone() as BasicProperties;
8991

90-
// Change values in source object
91-
bp.ContentType = "foo_15";
92-
bp.ContentEncoding = "foo_16";
93-
bp.Headers.Remove("foo_3");
94-
bp.Headers.Remove("foo_5");
95-
bp.Headers.Add("foo_17", "foo_18");
96-
bp.Headers.Add("foo_19", "foo_20");
97-
bp.DeliveryMode = 1;
98-
// Persistent also changes DeliveryMode's value to 1
99-
bp.Persistent = false;
100-
bp.Priority = 23;
101-
bp.CorrelationId = "foo_21";
102-
bp.ReplyTo = "foo_22";
103-
bp.Expiration = "foo_23";
104-
bp.MessageId = "foo_24";
105-
bp.Timestamp = new AmqpTimestamp(234);
106-
bp.Type = "foo_25";
107-
bp.UserId = "foo_26";
108-
bp.AppId = "foo_27";
109-
bp.ClusterId = "foo_28";
92+
// Change values in source object
93+
bp.ContentType = "foo_15";
94+
bp.ContentEncoding = "foo_16";
95+
bp.Headers.Remove("foo_3");
96+
bp.Headers.Remove("foo_5");
97+
bp.Headers.Add("foo_17", "foo_18");
98+
bp.Headers.Add("foo_19", "foo_20");
99+
bp.DeliveryMode = 1;
100+
// Persistent also changes DeliveryMode's value to 1
101+
bp.Persistent = false;
102+
bp.Priority = 23;
103+
bp.CorrelationId = "foo_21";
104+
bp.ReplyTo = "foo_22";
105+
bp.Expiration = "foo_23";
106+
bp.MessageId = "foo_24";
107+
bp.Timestamp = new AmqpTimestamp(234);
108+
bp.Type = "foo_25";
109+
bp.UserId = "foo_26";
110+
bp.AppId = "foo_27";
111+
bp.ClusterId = "foo_28";
110112

111-
// Make sure values have not changed in clone
112-
Assert.AreEqual("foo_1", bpClone.ContentType);
113-
Assert.AreEqual("foo_2", bpClone.ContentEncoding);
114-
Assert.AreEqual(2, bpClone.Headers.Count);
115-
Assert.AreEqual(true, bpClone.Headers.ContainsKey("foo_3"));
116-
Assert.AreEqual("foo_4", bpClone.Headers["foo_3"]);
117-
Assert.AreEqual(true, bpClone.Headers.ContainsKey("foo_5"));
118-
Assert.AreEqual("foo_6", bpClone.Headers["foo_5"]);
119-
Assert.AreEqual(2, bpClone.DeliveryMode);
120-
Assert.AreEqual(true, bpClone.Persistent);
121-
Assert.AreEqual(12, bpClone.Priority);
122-
Assert.AreEqual("foo_7", bpClone.CorrelationId);
123-
Assert.AreEqual("foo_8", bpClone.ReplyTo);
124-
Assert.AreEqual("foo_9", bpClone.Expiration);
125-
Assert.AreEqual("foo_10", bpClone.MessageId);
126-
Assert.AreEqual(new AmqpTimestamp(123), bpClone.Timestamp);
127-
Assert.AreEqual("foo_11", bpClone.Type);
128-
Assert.AreEqual("foo_12", bpClone.UserId);
129-
Assert.AreEqual("foo_13", bpClone.AppId);
130-
Assert.AreEqual("foo_14", bpClone.ClusterId);
131-
}
113+
// Make sure values have not changed in clone
114+
Assert.AreEqual("foo_1", bpClone.ContentType);
115+
Assert.AreEqual("foo_2", bpClone.ContentEncoding);
116+
Assert.AreEqual(2, bpClone.Headers.Count);
117+
Assert.AreEqual(true, bpClone.Headers.ContainsKey("foo_3"));
118+
Assert.AreEqual("foo_4", bpClone.Headers["foo_3"]);
119+
Assert.AreEqual(true, bpClone.Headers.ContainsKey("foo_5"));
120+
Assert.AreEqual("foo_6", bpClone.Headers["foo_5"]);
121+
Assert.AreEqual(2, bpClone.DeliveryMode);
122+
Assert.AreEqual(true, bpClone.Persistent);
123+
Assert.AreEqual(12, bpClone.Priority);
124+
Assert.AreEqual("foo_7", bpClone.CorrelationId);
125+
Assert.AreEqual("foo_8", bpClone.ReplyTo);
126+
Assert.AreEqual("foo_9", bpClone.Expiration);
127+
Assert.AreEqual("foo_10", bpClone.MessageId);
128+
Assert.AreEqual(new AmqpTimestamp(123), bpClone.Timestamp);
129+
Assert.AreEqual("foo_11", bpClone.Type);
130+
Assert.AreEqual("foo_12", bpClone.UserId);
131+
Assert.AreEqual("foo_13", bpClone.AppId);
132+
Assert.AreEqual("foo_14", bpClone.ClusterId);
133+
}
132134

133-
private void TestBasicPropertiesNoneClone(BasicProperties bp)
134-
{
135-
// Do not set any member and clone
136-
BasicProperties bpClone = bp.Clone() as BasicProperties;
135+
private void TestBasicPropertiesNoneClone(BasicProperties bp)
136+
{
137+
// Do not set any member and clone
138+
BasicProperties bpClone = bp.Clone() as BasicProperties;
137139

138-
// Set members in source object
139-
bp.ContentType = "foo_1";
140-
bp.ContentEncoding = "foo_2";
141-
bp.Headers = new Dictionary<string, object>
140+
// Set members in source object
141+
bp.ContentType = "foo_1";
142+
bp.ContentEncoding = "foo_2";
143+
bp.Headers = new Dictionary<string, object>
142144
{
143145
{ "foo_3", "foo_4" },
144146
{ "foo_5", "foo_6" }
145147
};
146-
bp.DeliveryMode = 2;
147-
// Persistent also changes DeliveryMode's value to 2
148-
bp.Persistent = true;
149-
bp.Priority = 12;
150-
bp.CorrelationId = "foo_7";
151-
bp.ReplyTo = "foo_8";
152-
bp.Expiration = "foo_9";
153-
bp.MessageId = "foo_10";
154-
bp.Timestamp = new AmqpTimestamp(123);
155-
bp.Type = "foo_11";
156-
bp.UserId = "foo_12";
157-
bp.AppId = "foo_13";
158-
bp.ClusterId = "foo_14";
148+
bp.DeliveryMode = 2;
149+
// Persistent also changes DeliveryMode's value to 2
150+
bp.Persistent = true;
151+
bp.Priority = 12;
152+
bp.CorrelationId = "foo_7";
153+
bp.ReplyTo = "foo_8";
154+
bp.Expiration = "foo_9";
155+
bp.MessageId = "foo_10";
156+
bp.Timestamp = new AmqpTimestamp(123);
157+
bp.Type = "foo_11";
158+
bp.UserId = "foo_12";
159+
bp.AppId = "foo_13";
160+
bp.ClusterId = "foo_14";
159161

160-
// Check that no member is present in clone
161-
Assert.AreEqual(false, bpClone.IsContentTypePresent());
162-
Assert.AreEqual(false, bpClone.IsContentEncodingPresent());
163-
Assert.AreEqual(false, bpClone.IsHeadersPresent());
164-
Assert.AreEqual(false, bpClone.IsDeliveryModePresent());
165-
Assert.AreEqual(false, bpClone.IsPriorityPresent());
166-
Assert.AreEqual(false, bpClone.IsCorrelationIdPresent());
167-
Assert.AreEqual(false, bpClone.IsReplyToPresent());
168-
Assert.AreEqual(false, bpClone.IsExpirationPresent());
169-
Assert.AreEqual(false, bpClone.IsMessageIdPresent());
170-
Assert.AreEqual(false, bpClone.IsTimestampPresent());
171-
Assert.AreEqual(false, bpClone.IsTypePresent());
172-
Assert.AreEqual(false, bpClone.IsUserIdPresent());
173-
Assert.AreEqual(false, bpClone.IsAppIdPresent());
174-
Assert.AreEqual(false, bpClone.IsClusterIdPresent());
162+
// Check that no member is present in clone
163+
Assert.AreEqual(false, bpClone.IsContentTypePresent());
164+
Assert.AreEqual(false, bpClone.IsContentEncodingPresent());
165+
Assert.AreEqual(false, bpClone.IsHeadersPresent());
166+
Assert.AreEqual(false, bpClone.IsDeliveryModePresent());
167+
Assert.AreEqual(false, bpClone.IsPriorityPresent());
168+
Assert.AreEqual(false, bpClone.IsCorrelationIdPresent());
169+
Assert.AreEqual(false, bpClone.IsReplyToPresent());
170+
Assert.AreEqual(false, bpClone.IsExpirationPresent());
171+
Assert.AreEqual(false, bpClone.IsMessageIdPresent());
172+
Assert.AreEqual(false, bpClone.IsTimestampPresent());
173+
Assert.AreEqual(false, bpClone.IsTypePresent());
174+
Assert.AreEqual(false, bpClone.IsUserIdPresent());
175+
Assert.AreEqual(false, bpClone.IsAppIdPresent());
176+
Assert.AreEqual(false, bpClone.IsClusterIdPresent());
177+
}
175178
}
176179
}

0 commit comments

Comments
 (0)