Migrate to Directory.Packages.props
Signed-off-by: Clemens Vasters <clemens@vasters.com>
This commit is contained in:
Clemens Vasters
Родитель
d0f698335a
Коммит
33ffe2da82
|
|
@ -6,7 +6,6 @@
|
|||
<Import Project="version.props" />
|
||||
<Import Project="build\sources.props" />
|
||||
<Import Project="build\repo.props" />
|
||||
<Import Project="build\dependencies.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<Product>Microsoft Azure Relay Bridge</Product>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<!-- Package versions defined here are applied to all projects in the directory -->
|
||||
<PackageVersion Include="Packaging.Targets" Version="0.1.226" />
|
||||
<PackageVersion Include="Wix" Version="3.14.1" />
|
||||
<PackageVersion Include="Microsoft.Diagnostics.Tracing.EventSource" Version="1.1.28" />
|
||||
<PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.66" />
|
||||
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.8" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
|
||||
<PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
|
||||
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
|
||||
<PackageVersion Include="System.Console" Version="4.3.1" />
|
||||
<PackageVersion Include="System.IO" Version="4.3.0" />
|
||||
<PackageVersion Include="System.Memory" Version="4.5.5" />
|
||||
<PackageVersion Include="System.Diagnostics.Tracing" Version="4.3.0" />
|
||||
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
|
||||
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
|
||||
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
|
||||
<PackageVersion Include="YamlDotNet" Version="16.0.0" />
|
||||
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
|
||||
<PackageVersion Include="xunit" Version="2.9.0" />
|
||||
<PackageVersion Include="NuGet.Versioning" Version="6.11.0" />
|
||||
<PackageVersion Include="dotnet-xunit" Version="2.3.1" />
|
||||
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
|
||||
<PackageVersion Include="xunit.runner.msbuild" Version="2.4.1" />
|
||||
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageVersion Include="Microsoft.Azure.Relay" Version="3.0.1" />
|
||||
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
|
||||
<PackageVersion Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
|
||||
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
|
||||
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
|
||||
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
|
||||
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -11,10 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Relay.Bridg
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{81A22557-15D8-47E9-A19E-0335F16B25F3}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
.appveyor.yml = .appveyor.yml
|
||||
.gitattributes = .gitattributes
|
||||
.gitignore = .gitignore
|
||||
.travis.yml = .travis.yml
|
||||
build.cmd = build.cmd
|
||||
build.sh = build.sh
|
||||
CONFIG.md = CONFIG.md
|
||||
|
|
@ -38,7 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8078DD38-3B9F-4841-8918-D4FD7C1D6E66}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
build\dependencies.props = build\dependencies.props
|
||||
build\Key.snk = build\Key.snk
|
||||
build\repo.props = build\repo.props
|
||||
build\sources.props = build\sources.props
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Package Versions">
|
||||
<PackagingTargetsPackageVersion>0.1.220</PackagingTargetsPackageVersion>
|
||||
<WixPackageVersion>3.14.1</WixPackageVersion>
|
||||
<MicrosoftDiagnosticsTracingEventSourcePackageVersion>1.1.28</MicrosoftDiagnosticsTracingEventSourcePackageVersion>
|
||||
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.66</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>8.0.0</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNetHttpHeadersPackageVersion>2.2.8</MicrosoftNetHttpHeadersPackageVersion>
|
||||
<MicrosoftNETTestSdkPackageVersion>17.3.0</MicrosoftNETTestSdkPackageVersion>
|
||||
<SystemNetNetworkInformationPackageVersion>4.3.0</SystemNetNetworkInformationPackageVersion>
|
||||
<SystemThreadingTasksDataflowPackageVersion>5.0.0</SystemThreadingTasksDataflowPackageVersion>
|
||||
<SystemConsolePackageVersion>4.3.1</SystemConsolePackageVersion>
|
||||
<SystemIOPackageVersion>4.3.0</SystemIOPackageVersion>
|
||||
<SystemMemoryPackageVersion>4.5.5</SystemMemoryPackageVersion>
|
||||
<SystemDiagnosticsTracingPackageVersion>4.3.0</SystemDiagnosticsTracingPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
|
||||
<SystemNetNameResolutionPackageVersion>4.3.0</SystemNetNameResolutionPackageVersion>
|
||||
<YamlDotNetPackageVersion>12.0.0</YamlDotNetPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>6.0.0</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
|
||||
<XunitPackageVersion>2.4.2</XunitPackageVersion>
|
||||
<NuGetVersioningVersion>5.9.0</NuGetVersioningVersion>
|
||||
<DotnetXunitPackageVersion>2.3.1</DotnetXunitPackageVersion>
|
||||
<XunitRunnerVisualStudioPackageVersion>2.4.5</XunitRunnerVisualStudioPackageVersion>
|
||||
<XunitRunnerMsBuildPackageVersion>2.4.1</XunitRunnerMsBuildPackageVersion>
|
||||
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
|
||||
<MicrosoftAzureRelayPackageVersion>3.0.1</MicrosoftAzureRelayPackageVersion>
|
||||
<McMasterExtensionsCommandLineUtilsPackageVersion>4.0.1</McMasterExtensionsCommandLineUtilsPackageVersion>
|
||||
<SerilogExtensionsLoggingFilePackageVersion>3.0.0</SerilogExtensionsLoggingFilePackageVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
|
||||
</Project>
|
||||
|
|
@ -17,17 +17,17 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Azure.Identity" Version="1.11.4" />
|
||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.Azure.Relay" Version="$(MicrosoftAzureRelayPackageVersion)" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
|
||||
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
|
||||
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" />
|
||||
<PackageReference Include="System.Net.NetworkInformation" Version="$(SystemNetNetworkInformationPackageVersion)" />
|
||||
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetPackageVersion)" />
|
||||
<PackageReference Include="System.Diagnostics.Tracing" Version="$(SystemDiagnosticsTracingPackageVersion)" />
|
||||
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
|
||||
<PackageReference Include="Azure.Identity" />
|
||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
|
||||
<PackageReference Include="Microsoft.Azure.Relay" />
|
||||
<PackageReference Include="Newtonsoft.Json" />
|
||||
<PackageReference Include="System.Net.Http" />
|
||||
<PackageReference Include="System.Memory" />
|
||||
<PackageReference Include="System.Net.NameResolution" />
|
||||
<PackageReference Include="System.Net.NetworkInformation" />
|
||||
<PackageReference Include="YamlDotNet" />
|
||||
<PackageReference Include="System.Diagnostics.Tracing" />
|
||||
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -102,11 +102,18 @@ namespace azbridge
|
|||
|
||||
.ConfigureServices(services =>
|
||||
{
|
||||
LoggerProviderOptions.RegisterProviderOptions<EventLogSettings, EventLogLoggerProvider>(services);
|
||||
services.Configure<EventLogSettings>(settings =>
|
||||
if (OperatingSystem.IsWindows())
|
||||
{
|
||||
settings.SourceName = ServiceName;
|
||||
});
|
||||
LoggerProviderOptions.RegisterProviderOptions<EventLogSettings, EventLogLoggerProvider>(services);
|
||||
services.Configure<EventLogSettings>(settings =>
|
||||
{
|
||||
if (OperatingSystem.IsWindows())
|
||||
{
|
||||
settings.SourceName = ServiceName;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
services.AddSingleton(config);
|
||||
services.AddHostedService<RelayBridgeService>();
|
||||
})
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@
|
|||
<Choose>
|
||||
<When Condition="$(DefineConstants.Contains('_WINDOWS'))">
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
<Otherwise>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" />
|
||||
</ItemGroup>
|
||||
</Otherwise>
|
||||
</Choose>
|
||||
|
|
@ -84,17 +84,17 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
|
||||
<PackageReference Include="System.Console" Version="$(SystemConsolePackageVersion)" />
|
||||
<PackageReference Include="System.IO" Version="$(SystemIOPackageVersion)" />
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
|
||||
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
|
||||
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" />
|
||||
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging.File" Version="$(SerilogExtensionsLoggingFilePackageVersion)" />
|
||||
<PackageReference Include="Packaging.Targets" Version="$(PackagingTargetsPackageVersion)" />
|
||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
|
||||
<PackageReference Include="System.Console" />
|
||||
<PackageReference Include="System.IO" />
|
||||
<PackageReference Include="System.Memory" />
|
||||
<PackageReference Include="System.Net.Http" />
|
||||
<PackageReference Include="System.Net.NameResolution" />
|
||||
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging.File" />
|
||||
<PackageReference Include="Packaging.Targets" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
|
||||
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
||||
<PackageReference Include="xunit" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ namespace Microsoft.Azure.Relay.Bridge.Test
|
|||
|
||||
|
||||
[Fact]
|
||||
public void HttpBridge()
|
||||
public async Task HttpBridge()
|
||||
{
|
||||
// set up the bridge first
|
||||
Config cfg = new Config
|
||||
|
|
@ -319,7 +319,7 @@ namespace Microsoft.Azure.Relay.Bridge.Test
|
|||
{
|
||||
RelayConnectionStringBuilder csb = new RelayConnectionStringBuilder(Utilities.GetConnectionString());
|
||||
var httpEndpoint = new UriBuilder(csb.Endpoint) { Scheme = "https", Port = 443, Path="http" }.Uri;
|
||||
var httpSasToken = TokenProvider.CreateSharedAccessSignatureTokenProvider(csb.SharedAccessKeyName, csb.SharedAccessKey).GetTokenAsync(httpEndpoint.AbsoluteUri, TimeSpan.FromHours(1)).Result.TokenString;
|
||||
var httpSasToken = (await TokenProvider.CreateSharedAccessSignatureTokenProvider(csb.SharedAccessKeyName, csb.SharedAccessKey).GetTokenAsync(httpEndpoint.AbsoluteUri, TimeSpan.FromHours(1))).TokenString;
|
||||
|
||||
using (var l = new HttpListener())
|
||||
{
|
||||
|
|
@ -371,21 +371,21 @@ namespace Microsoft.Azure.Relay.Bridge.Test
|
|||
c.DefaultRequestHeaders.Add("Authorization", httpSasToken);
|
||||
|
||||
// listen for exactly one request
|
||||
l.GetContextAsync().ContinueWith(plainHandler);
|
||||
_ = l.GetContextAsync().ContinueWith(plainHandler);
|
||||
|
||||
var r = c.PostAsync(httpEndpoint, new StringContent(testMessage)).GetAwaiter().GetResult();
|
||||
var r = await c.PostAsync(httpEndpoint, new StringContent(testMessage));
|
||||
Assert.True(r.IsSuccessStatusCode);
|
||||
var result = r.Content.ReadAsStringAsync().GetAwaiter().GetResult();
|
||||
var result = await r.Content.ReadAsStringAsync();
|
||||
Assert.Equal(testMessage, result.Trim());
|
||||
r.Dispose();
|
||||
|
||||
// listen for exactly one request
|
||||
l.GetContextAsync().ContinueWith(plainHandler);
|
||||
_ = l.GetContextAsync().ContinueWith(plainHandler);
|
||||
|
||||
var mtv = MediaTypeHeaderValue.Parse("application/cloudevents+json;charset=utf-8;foo=bar");
|
||||
var r2 = c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv)).GetAwaiter().GetResult();
|
||||
var r2 = await c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv));
|
||||
Assert.True(r2.IsSuccessStatusCode);
|
||||
var result2 = r2.Content.ReadAsStringAsync().GetAwaiter().GetResult();
|
||||
var result2 = await r2.Content.ReadAsStringAsync();
|
||||
Assert.Equal(testMessage, result2.Trim());
|
||||
r2.Dispose();
|
||||
}
|
||||
|
|
@ -396,21 +396,21 @@ namespace Microsoft.Azure.Relay.Bridge.Test
|
|||
c.DefaultRequestHeaders.Add("Authorization", "Bearer bearbear");
|
||||
|
||||
// listen for exactly one request
|
||||
l.GetContextAsync().ContinueWith(localAuthHandler);
|
||||
_ = l.GetContextAsync().ContinueWith(localAuthHandler);
|
||||
|
||||
var r = c.PostAsync(httpEndpoint, new StringContent(testMessage)).GetAwaiter().GetResult();
|
||||
var r = await c.PostAsync(httpEndpoint, new StringContent(testMessage));
|
||||
Assert.True(r.IsSuccessStatusCode);
|
||||
var result = r.Content.ReadAsStringAsync().GetAwaiter().GetResult();
|
||||
var result = await r.Content.ReadAsStringAsync();
|
||||
Assert.Equal(testMessage, result.Trim());
|
||||
r.Dispose();
|
||||
|
||||
// listen for exactly one request
|
||||
l.GetContextAsync().ContinueWith(localAuthHandler);
|
||||
_ = l.GetContextAsync().ContinueWith(localAuthHandler);
|
||||
|
||||
var mtv = MediaTypeHeaderValue.Parse("application/cloudevents+json;charset=utf-8;foo=bar");
|
||||
var r2 = c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv)).GetAwaiter().GetResult();
|
||||
var r2 = await c.PostAsync(httpEndpoint, new StringContent(testMessage, mtv));
|
||||
Assert.True(r2.IsSuccessStatusCode);
|
||||
var result2 = r2.Content.ReadAsStringAsync().GetAwaiter().GetResult();
|
||||
var result2 = await r2.Content.ReadAsStringAsync();
|
||||
Assert.Equal(testMessage, result2.Trim());
|
||||
r2.Dispose();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsPackageVersion)" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
|
||||
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
|
||||
<PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" />
|
||||
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetPackageVersion)" />
|
||||
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
|
||||
<PackageReference Include="Newtonsoft.Json" />
|
||||
<PackageReference Include="System.Net.Http" />
|
||||
<PackageReference Include="System.Memory" />
|
||||
<PackageReference Include="System.Net.NameResolution" />
|
||||
<PackageReference Include="YamlDotNet" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче