Skip to content

Commit 33ffe2d

Browse files
clemensvclemensv
committed
Migrate to Directory.Packages.props
Signed-off-by: Clemens Vasters <clemens@vasters.com>
1 parent d0f6983 commit 33ffe2d

File tree

10 files changed

+101
-95
lines changed

10 files changed

+101
-95
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<Import Project="version.props" />
77
<Import Project="build\sources.props" />
88
<Import Project="build\repo.props" />
9-
<Import Project="build\dependencies.props" />
109

1110
<PropertyGroup>
1211
<Product>Microsoft Azure Relay Bridge</Product>

‎Directory.Packages.props‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- Package versions defined here are applied to all projects in the directory -->
7+
<PackageVersion Include="Packaging.Targets" Version="0.1.226" />
8+
<PackageVersion Include="Wix" Version="3.14.1" />
9+
<PackageVersion Include="Microsoft.Diagnostics.Tracing.EventSource" Version="1.1.28" />
10+
<PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.66" />
11+
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.8" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
13+
<PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
14+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
15+
<PackageVersion Include="System.Console" Version="4.3.1" />
16+
<PackageVersion Include="System.IO" Version="4.3.0" />
17+
<PackageVersion Include="System.Memory" Version="4.5.5" />
18+
<PackageVersion Include="System.Diagnostics.Tracing" Version="4.3.0" />
19+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
20+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
21+
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
22+
<PackageVersion Include="YamlDotNet" Version="16.0.0" />
23+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
24+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
25+
<PackageVersion Include="xunit" Version="2.9.0" />
26+
<PackageVersion Include="NuGet.Versioning" Version="6.11.0" />
27+
<PackageVersion Include="dotnet-xunit" Version="2.3.1" />
28+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
29+
<PackageVersion Include="xunit.runner.msbuild" Version="2.4.1" />
30+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
31+
<PackageVersion Include="Microsoft.Azure.Relay" Version="3.0.1" />
32+
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
33+
<PackageVersion Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
34+
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
35+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
36+
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
37+
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
38+
</ItemGroup>
39+
</Project>

‎Microsoft.Azure.Relay.Bridge.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Relay.Bridg
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{81A22557-15D8-47E9-A19E-0335F16B25F3}"
1313
ProjectSection(SolutionItems) = preProject
14-
.appveyor.yml = .appveyor.yml
1514
.gitattributes = .gitattributes
1615
.gitignore = .gitignore
17-
.travis.yml = .travis.yml
1816
build.cmd = build.cmd
1917
build.sh = build.sh
2018
CONFIG.md = CONFIG.md
@@ -38,7 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3836
EndProject
3937
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8078DD38-3B9F-4841-8918-D4FD7C1D6E66}"
4038
ProjectSection(SolutionItems) = preProject
41-
build\dependencies.props = build\dependencies.props
4239
build\Key.snk = build\Key.snk
4340
build\repo.props = build\repo.props
4441
build\sources.props = build\sources.props

‎build/dependencies.props‎

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

‎src/Microsoft.Azure.Relay.Bridge/Microsoft.Azure.Relay.Bridge.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Azure.Identity" Version="1.11.4" />
21-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
22-
<PackageReference Include="Microsoft.Azure.Relay" Version="$(MicrosoftAzureRelayPackageVersion)" />
23-
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
24-
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
25-
<PackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
26-
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" />
27-
<PackageReference Include="System.Net.NetworkInformation" Version="$(SystemNetNetworkInformationPackageVersion)" />
28-
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetPackageVersion)" />
29-
<PackageReference Include="System.Diagnostics.Tracing" Version="$(SystemDiagnosticsTracingPackageVersion)" />
30-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
20+
<PackageReference Include="Azure.Identity" />
21+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
22+
<PackageReference Include="Microsoft.Azure.Relay" />
23+
<PackageReference Include="Newtonsoft.Json" />
24+
<PackageReference Include="System.Net.Http" />
25+
<PackageReference Include="System.Memory" />
26+
<PackageReference Include="System.Net.NameResolution" />
27+
<PackageReference Include="System.Net.NetworkInformation" />
28+
<PackageReference Include="YamlDotNet" />
29+
<PackageReference Include="System.Diagnostics.Tracing" />
30+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/azbridge/ServiceLauncher.cs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,18 @@ internal static async Task RunAsync(CommandLineSettings settings)
102102

103103
.ConfigureServices(services =>
104104
{
105-
LoggerProviderOptions.RegisterProviderOptions<EventLogSettings, EventLogLoggerProvider>(services);
106-
services.Configure<EventLogSettings>(settings =>
105+
if (OperatingSystem.IsWindows())
107106
{
108-
settings.SourceName = ServiceName;
109-
});
107+
LoggerProviderOptions.RegisterProviderOptions<EventLogSettings, EventLogLoggerProvider>(services);
108+
services.Configure<EventLogSettings>(settings =>
109+
{
110+
if (OperatingSystem.IsWindows())
111+
{
112+
settings.SourceName = ServiceName;
113+
}
114+
});
115+
}
116+
110117
services.AddSingleton(config);
111118
services.AddHostedService<RelayBridgeService>();
112119
})

‎src/azbridge/azbridge.csproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<Choose>
3434
<When Condition="$(DefineConstants.Contains('_WINDOWS'))">
3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
37-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
38-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" />
37+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
38+
<PackageReference Include="Microsoft.Extensions.Http" />
3939
</ItemGroup>
4040
</When>
4141
<Otherwise>
4242
<ItemGroup>
43-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
44-
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
45-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Hosting" />
44+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" />
45+
<PackageReference Include="Microsoft.Extensions.Http" />
4646
</ItemGroup>
4747
</Otherwise>
4848
</Choose>
@@ -84,17 +84,17 @@
8484
</PropertyGroup>
8585

8686
<ItemGroup>
87-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
88-
<PackageReference Include="System.Console" Version="$(SystemConsolePackageVersion)" />
89-
<PackageReference Include="System.IO" Version="$(SystemIOPackageVersion)" />
90-
<PackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
91-
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
92-
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" />
93-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
94-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
95-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
96-
<PackageReference Include="Serilog.Extensions.Logging.File" Version="$(SerilogExtensionsLoggingFilePackageVersion)" />
97-
<PackageReference Include="Packaging.Targets" Version="$(PackagingTargetsPackageVersion)" />
87+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
88+
<PackageReference Include="System.Console" />
89+
<PackageReference Include="System.IO" />
90+
<PackageReference Include="System.Memory" />
91+
<PackageReference Include="System.Net.Http" />
92+
<PackageReference Include="System.Net.NameResolution" />
93+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
94+
<PackageReference Include="Microsoft.Extensions.Logging" />
95+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
96+
<PackageReference Include="Serilog.Extensions.Logging.File" />
97+
<PackageReference Include="Packaging.Targets" />
9898
</ItemGroup>
9999

100100
<PropertyGroup>

‎test/unit/Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
11-
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11+
<PackageReference Include="xunit" />
12+
<PackageReference Include="xunit.runner.visualstudio" />
1313
</ItemGroup>
1414
</Project>

‎test/unit/Microsoft.Azure.Relay.Bridge.Tests/BridgeTest.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public void TcpBridgeBadListener()
297297

298298

299299
[Fact]
300-
public void HttpBridge()
300+
public async Task HttpBridge()
301301
{
302302
// set up the bridge first
303303
Config cfg = new Config
@@ -319,7 +319,7 @@ public void HttpBridge()
319319
{
320320
RelayConnectionStringBuilder csb = new RelayConnectionStringBuilder(Utilities.GetConnectionString());
321321
var httpEndpoint = new UriBuilder(csb.Endpoint) { Scheme = "https", Port = 443, Path="http" }.Uri;
322-
var httpSasToken = TokenProvider.CreateSharedAccessSignatureTokenProvider(csb.SharedAccessKeyName, csb.SharedAccessKey).GetTokenAsync(httpEndpoint.AbsoluteUri, TimeSpan.FromHours(1)).Result.TokenString;
322+
var httpSasToken = (await TokenProvider.CreateSharedAccessSignatureTokenProvider(csb.SharedAccessKeyName, csb.SharedAccessKey).GetTokenAsync(httpEndpoint.AbsoluteUri, TimeSpan.FromHours(1))).TokenString;
323323

324324
using (var l = new HttpListener())
325325
{
@@ -371,21 +371,21 @@ public void HttpBridge()
371371
c.DefaultRequestHeaders.Add("Authorization", httpSasToken);
372372

373373
// listen for exactly one request
374-
l.GetContextAsync().ContinueWith(plainHandler);
374+
_ = l.GetContextAsync().ContinueWith(plainHandler);
375375

376-
var r = c.PostAsync(httpEndpoint, new StringContent(testMessage)).GetAwaiter().GetResult();
376+
var r = await c.PostAsync(httpEndpoint, new StringContent(testMessage));
377377
Assert.True(r.IsSuccessStatusCode);
378-
var result = r.Content.ReadAsStringAsync().GetAwaiter().GetResult();
378+
var result = await r.Content.ReadAsStringAsync();
379379
Assert.Equal(testMessage, result.Trim());
380380
r.Dispose();
381381

382382
// listen for exactly one request
383-
l.GetContextAsync().ContinueWith(plainHandler);
383+
_ = l.GetContextAsync().ContinueWith(plainHandler);
384384

385385
var mtv = MediaTypeHeaderValue.Parse("application/cloudevents+json;charset=utf-8;foo=bar");
386-
var r2 = c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv)).GetAwaiter().GetResult();
386+
var r2 = await c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv));
387387
Assert.True(r2.IsSuccessStatusCode);
388-
var result2 = r2.Content.ReadAsStringAsync().GetAwaiter().GetResult();
388+
var result2 = await r2.Content.ReadAsStringAsync();
389389
Assert.Equal(testMessage, result2.Trim());
390390
r2.Dispose();
391391
}
@@ -396,21 +396,21 @@ public void HttpBridge()
396396
c.DefaultRequestHeaders.Add("Authorization", "Bearer bearbear");
397397

398398
// listen for exactly one request
399-
l.GetContextAsync().ContinueWith(localAuthHandler);
399+
_ = l.GetContextAsync().ContinueWith(localAuthHandler);
400400

401-
var r = c.PostAsync(httpEndpoint, new StringContent(testMessage)).GetAwaiter().GetResult();
401+
var r = await c.PostAsync(httpEndpoint, new StringContent(testMessage));
402402
Assert.True(r.IsSuccessStatusCode);
403-
var result = r.Content.ReadAsStringAsync().GetAwaiter().GetResult();
403+
var result = await r.Content.ReadAsStringAsync();
404404
Assert.Equal(testMessage, result.Trim());
405405
r.Dispose();
406406

407407
// listen for exactly one request
408-
l.GetContextAsync().ContinueWith(localAuthHandler);
408+
_ = l.GetContextAsync().ContinueWith(localAuthHandler);
409409

410410
var mtv = MediaTypeHeaderValue.Parse("application/cloudevents+json;charset=utf-8;foo=bar");
411-
var r2 = c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv)).GetAwaiter().GetResult();
411+
var r2 = await c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv));
412412
Assert.True(r2.IsSuccessStatusCode);
413-
var result2 = r2.Content.ReadAsStringAsync().GetAwaiter().GetResult();
413+
var result2 = await r2.Content.ReadAsStringAsync();
414414
Assert.Equal(testMessage, result2.Trim());
415415
r2.Dispose();
416416
}

‎test/unit/Microsoft.Azure.Relay.Bridge.Tests/Microsoft.Azure.Relay.Bridge.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
11-
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
12-
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
13-
<PackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
14-
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" />
15-
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetPackageVersion)" />
10+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
11+
<PackageReference Include="Newtonsoft.Json" />
12+
<PackageReference Include="System.Net.Http" />
13+
<PackageReference Include="System.Memory" />
14+
<PackageReference Include="System.Net.NameResolution" />
15+
<PackageReference Include="YamlDotNet" />
1616
</ItemGroup>
1717

1818
<PropertyGroup>

0 commit comments

Comments
 (0)