Azure
/
azure-relay-bridge
зеркало из https://github.com/Azure/azure-relay-bridge.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updated test environment 

Signed-off-by: clemensv <clemensv@microsoft.com>
This commit is contained in:
clemensv 2019-11-27 19:34:11 +01:00
Родитель 87af41e38d
Коммит f1e89b6f9c
34 изменённых файлов: 118 добавлений и 141 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Directory.Build.targets
Просмотреть файл

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.1' ">$(NETStandardLibrary21PackageVersion)</NETStandardImplicitPackageVersion>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>

4
Dockerfile
Просмотреть файл

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as build
FROM mcr.microsoft.com/dotnet/core/sdk:3.0 as build
WORKDIR /azure-relay-bridge/src
@ -18,6 +18,6 @@ WORKDIR /azure-relay-bridge/src/azbridge
RUN dotnet publish azbridge.csproj -c Release -f netcoreapp3.0 -o /app
FROM mcr.microsoft.com/dotnet/core/runtime:2.1
FROM mcr.microsoft.com/dotnet/core/runtime:3.0
WORKDIR /app
COPY --from=publish /app .

6
Microsoft.Azure.Relay.Bridge.sln
Просмотреть файл

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
# Visual Studio Version 16
VisualStudioVersion = 16.0.29403.142
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Relay.Bridge", "src\Microsoft.Azure.Relay.Bridge\Microsoft.Azure.Relay.Bridge.csproj", "{864AE8D8-F770-499B-A9E2-46E07C8FD3D2}"
EndProject
@ -28,6 +28,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
run.cmd = run.cmd
run.ps1 = run.ps1
run.sh = run.sh
verify-build.cmd = verify-build.cmd
verify-build.sh = verify-build.sh
version.props = version.props
EndProjectSection
EndProject

6
README.md
Просмотреть файл

@ -185,12 +185,12 @@ the full .NET Framework and the installer can only be built on Windows. You will
need the "Build Tools for Visual Studio 2017", and ideally a local install of
Visual Studio 2017 with desktop C# support.
All other versions are built with the .NET Core 2.0 or .NET Core 2.1 SDK. The DEB and
All other versions are built with the .NET Core 3.0 SDK. The DEB and
RPM packages are only created when building on a Unix (i.e. Linux or macOS) host.
dotb
The ideal build environment is a Windows 10/Windows Server 2016 host with Docker for
Windows installed. The `package-all.cmd` script will first build and package all Windows
targets, and then launch a docker-based build with the official Microsoft .NET Core 2.1
targets, and then launch a docker-based build with the official Microsoft .NET Core 3.0
SDK image for the remaining targets. The `package.sh` script will only build and package
the Unix targets, the `package.cmd` script only Windows targets.

44
build/dependencies.props
Просмотреть файл

@ -3,39 +3,39 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<PropertyGroup Label="Package Versions">
<PackagingTargetsPackageVersion>0.1.39</PackagingTargetsPackageVersion>
<DotnetDebPackageVersion>0.1.39</DotnetDebPackageVersion>
<DotnetRpmPackageVersion>0.1.39</DotnetRpmPackageVersion>
<DotnetZipPackageVersion>0.1.39</DotnetZipPackageVersion>
<DotnetTarballPackageVersion>0.1.39</DotnetTarballPackageVersion>
<WixPackageVersion>3.11.1</WixPackageVersion>
<PackagingTargetsPackageVersion>0.1.121</PackagingTargetsPackageVersion>
<DotnetDebPackageVersion>0.1.121</DotnetDebPackageVersion>
<DotnetRpmPackageVersion>0.1.121</DotnetRpmPackageVersion>
<DotnetZipPackageVersion>0.1.121</DotnetZipPackageVersion>
<DotnetTarballPackageVersion>0.1.121</DotnetTarballPackageVersion>
<WixPackageVersion>3.11.2</WixPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftDiagnosticsTracingEventSourcePackageVersion>1.1.28</MicrosoftDiagnosticsTracingEventSourcePackageVersion>
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.22</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
<MicrosoftNETCoreApp30PackageVersion>2.0.0</MicrosoftNETCoreApp30PackageVersion>
<MicrosoftNetHttpHeadersPackageVersion>2.1.0</MicrosoftNetHttpHeadersPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-rtm-26502-02</SystemNetHttpWinHttpHandlerPackageVersion>
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.48</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
<MicrosoftNETCoreApp30PackageVersion>3.0.1</MicrosoftNETCoreApp30PackageVersion>
<MicrosoftNetHttpHeadersPackageVersion>3.0.1</MicrosoftNetHttpHeadersPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.4.0</MicrosoftNETTestSdkPackageVersion>
<NETStandardLibrary21PackageVersion>2.1.0</NETStandardLibrary21PackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.6.0</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetNetworkInformationPackageVersion>4.3.0</SystemNetNetworkInformationPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.8.0</SystemThreadingTasksDataflowPackageVersion>
<SystemConsolePackageVersion>4.3.1</SystemConsolePackageVersion>
<SystemIOPackageVersion>4.3.0</SystemIOPackageVersion>
<SystemConfigurationPackageVersion>4.3.0</SystemConfigurationPackageVersion>
<SystemDiagnosticsTracingPackageVersion>4.3.0</SystemDiagnosticsTracingPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemNetHttpPackageVersion>4.3.3</SystemNetHttpPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
<SystemNetNameResolutionPackageVersion>4.3.0</SystemNetNameResolutionPackageVersion>
<YamlDotNetSignedPackageVersion>5.0.1</YamlDotNetSignedPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>2.1.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<XunitPackageVersion>2.4.0</XunitPackageVersion>
<YamlDotNetSignedPackageVersion>6.0.0</YamlDotNetSignedPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
<DotnetXunitPackageVersion>2.3.1</DotnetXunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
<XunitRunnerMsBuildPackageVersion>2.4.0</XunitRunnerMsBuildPackageVersion>
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
<MicrosoftAzureRelayPackageVersion>2.0.0-preview1-20180523</MicrosoftAzureRelayPackageVersion>
<McMasterExtensionsCommandLineUtilsPackageVersion>2.2.5</McMasterExtensionsCommandLineUtilsPackageVersion>
<NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
<MicrosoftAzureRelayPackageVersion>2.0.1</MicrosoftAzureRelayPackageVersion>
<McMasterExtensionsCommandLineUtilsPackageVersion>2.4.4</McMasterExtensionsCommandLineUtilsPackageVersion>
<SerilogExtensionsLoggingFilePackageVersion>1.1.0</SerilogExtensionsLoggingFilePackageVersion>
</PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />

2
package-all.cmd
Просмотреть файл

@ -22,5 +22,5 @@ if %_DOCKER_BUILD% == "true" (
if not errorlevel 0 exit /b 1
if %_DOCKER_BUILD% == "true" (
echo *** Building and packaging Unix/Linux Targets
docker run --rm -v %cd%:/build microsoft/dotnet:2.1-sdk /build/package.sh /p:TargetFramework=netcoreapp3.0 %*
docker run --rm -v %cd%:/build mcr.microsoft.com/dotnet/core/sdk:3.0-buster /build/package.sh /p:TargetFramework=netcoreapp3.0 %*
)

3
package.cmd
Просмотреть файл

@ -1,4 +1,3 @@
if not "%APPVEYOR_BUILD_NUMBER%"=="" set _BuildProp="/p:BuildNumber=%APPVEYOR_BUILD_NUMBER%"
if not "%APPVEYOR_BUILD_VERSION%"=="" set _VersionProp="/p:VersionPrefix=%APPVEYOR_BUILD_VERSION%"
.if not "%APPVEYOR_BUILD_VERSION%"=="" set _VersionProp="/p:VersionPrefix=%APPVEYOR_BUILD_VERSION%"
msbuild /t:clean,restore,build /p:WindowsOnly=true /p:Configuration=Debug %_BuildProp% %_VersionProp% %*
msbuild /t:clean,restore,build,package /p:WindowsOnly=true /p:Configuration=Release %_BuildProp% %_VersionProp% %*

1
package.sh
Просмотреть файл

@ -1,6 +1,5 @@
#!/bin/bash
pushd "${0%/*}" > /dev/null
if [ ! -z $APPVEYOR_BUILD_NUMBER ]; then _BuildProp="/p:BuildNumber=$APPVEYOR_BUILD_NUMBER"; fi
if [ ! -z $APPVEYOR_BUILD_VERSION ]; then _VersionProp="/p:VersionPrefix=$APPVEYOR_BUILD_VERSION"; fi
dotnet restore
dotnet msbuild /t:clean,restore,build /p:Configuration=Debug /p:TargetFramework=netcoreapp3.0 $_BuildProp $_VersionProp $@

4
src/Microsoft.Azure.Relay.Bridge/Configuration/Config.cs
Просмотреть файл

@ -1016,12 +1016,12 @@ namespace Microsoft.Azure.Relay.Bridge.Configuration
fileName, e.InnerException?.Message, e));
}
static Deserializer yamlDeserializer =
static IDeserializer yamlDeserializer =
new DeserializerBuilder()
.WithNamingConvention(new PascalCaseNamingConvention())
.Build();
static Serializer yamlSerializer =
static ISerializer yamlSerializer =
new SerializerBuilder()
.WithNamingConvention(new PascalCaseNamingConvention()).Build();

12
src/azbridge/Program.cs
Просмотреть файл

@ -94,7 +94,6 @@ namespace azbridge
return 3;
}
var loggerFactory = new LoggerFactory();
LogLevel logLevel = LogLevel.Error;
if (!settings.Quiet.HasValue || !settings.Quiet.Value)
{
@ -131,14 +130,17 @@ namespace azbridge
logLevel = LogLevel.None;
}
var loggerFactory = LoggerFactory.Create((builder) =>
{
if (string.IsNullOrEmpty(config.LogFileName))
{
builder.AddConsole();
}
});
if (!string.IsNullOrEmpty(config.LogFileName))
{
loggerFactory.AddFile(config.LogFileName, logLevel);
}
else
{
loggerFactory.AddConsole(logLevel);
}
logger = loggerFactory.CreateLogger("azbridge");
DiagnosticListener.AllListeners.Subscribe(new SubscriberObserver(logger));

5
src/azbridge/azbridge.csproj
Просмотреть файл

@ -26,6 +26,7 @@
<DebPriority>optional</DebPriority>
<DebSection>contrib/net</DebSection>
</PropertyGroup>
<!-- <ItemGroup>
<None Remove="azbridge_config.machine.yml" />
@ -79,10 +80,10 @@
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="dotnet-rpm" Version="$(DotnetRpmPackageVersion)" />
<!--<DotNetCliToolReference Include="dotnet-rpm" Version="$(DotnetRpmPackageVersion)" />
<DotNetCliToolReference Include="dotnet-deb" Version="$(DotnetDebPackageVersion)" />
<DotNetCliToolReference Include="dotnet-tarball" Version="$(DotnetTarballPackageVersion)" />
<DotNetCliToolReference Include="dotnet-zip" Version="$(DotnetZipPackageVersion)" />
<DotNetCliToolReference Include="dotnet-zip" Version="$(DotnetZipPackageVersion)" />-->
</ItemGroup>
<Choose>

12
test/docker/centos/Test.proj
Просмотреть файл

@ -5,15 +5,15 @@
</PropertyGroup>
<Target Name="Build">
<Exec Command="build.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="build.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="VSTest">
<Exec Command="test.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="test.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="Clean">
<Exec Command="clean.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="clean.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
</Project>

8
test/docker/centos/build.cmd
Просмотреть файл

@ -1,11 +1,9 @@
@echo off
if not "%1" == "" set BuildNumber=%1
if not "%2" == "" set VersionPrefix=%2
if not "%3" == "" set VersionSuffix=%3
if not "%4" == "" set TargetFramework=%4
if not "%1" == "" set VersionPrefix=%2
if not "%2" == "" set VersionSuffix=%3
if not "%3" == "" set TargetFramework=%4
if "%BuildNumber%"=="" set BuildNumber=0000
if "%VersionSuffix%"=="" set VersionSuffix=preview
if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
if "%TargetFramework%"=="" set TargetFramework=netcoreapp3.0

8
test/docker/centos/build.sh
Просмотреть файл

@ -1,12 +1,10 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

8
test/docker/centos/test.sh
Просмотреть файл

@ -1,12 +1,10 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

12
test/docker/debian/Test.proj
Просмотреть файл

@ -5,15 +5,15 @@
</PropertyGroup>
<Target Name="Build">
<Exec Command="build.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="build.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="VSTest">
<Exec Command="test.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="test.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="Clean">
<Exec Command="clean.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="clean.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
</Project>

8
test/docker/debian/build.cmd
Просмотреть файл

@ -1,11 +1,9 @@
@echo off
if not "%1" == "" set BuildNumber=%1
if not "%2" == "" set VersionPrefix=%2
if not "%3" == "" set VersionSuffix=%3
if not "%4" == "" set TargetFramework=%4
if not "%1" == "" set VersionPrefix=%1
if not "%2" == "" set VersionSuffix=%2
if not "%3" == "" set TargetFramework=%3
if "%BuildNumber%"=="" set BuildNumber=0000
if "%VersionSuffix%"=="" set VersionSuffix=preview
if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
if "%TargetFramework%"=="" set TargetFramework="netcoreapp3.0"

8
test/docker/debian/build.sh
Просмотреть файл

@ -1,11 +1,9 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

8
test/docker/debian/test.sh
Просмотреть файл

@ -1,12 +1,10 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

12
test/docker/fedora/Test.proj
Просмотреть файл

@ -5,15 +5,15 @@
</PropertyGroup>
<Target Name="Build">
<Exec Command="build.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="build.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="VSTest">
<Exec Command="test.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="test.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="Clean">
<Exec Command="clean.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="clean.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
</Project>

8
test/docker/fedora/build.cmd
Просмотреть файл

@ -1,11 +1,9 @@
@echo off
if not "%1" == "" set BuildNumber=%1
if not "%2" == "" set VersionPrefix=%2
if not "%3" == "" set VersionSuffix=%3
if not "%4" == "" set TargetFramework=%4
if not "%1" == "" set VersionPrefix=%1
if not "%2" == "" set VersionSuffix=%2
if not "%3" == "" set TargetFramework=%3
if "%BuildNumber%"=="" set BuildNumber=0000
if "%VersionSuffix%"=="" set VersionSuffix=preview
if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
if "%TargetFramework%"=="" set TargetFramework="netcoreapp3.0"

8
test/docker/fedora/build.sh
Просмотреть файл

@ -1,11 +1,9 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

8
test/docker/fedora/test.sh
Просмотреть файл

@ -1,12 +1,10 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

4
test/docker/test_nc_config_ping_pong.sh
Просмотреть файл

@ -5,12 +5,12 @@ rm -f ~/testoutput.log
_LOCALCONFIG=$(mktemp)
cat test_nc_config_ping_pong.local.yml > $_LOCALCONFIG
echo AzureRelayConnectionString : "$AZBRIDGE_TEST_CXNSTRING" >> $_LOCALCONFIG
/usr/share/azbridge/azbridge -f $_LOCALCONFIG >> ~/testoutput.log 2>&1 &
/usr/share/azbridge/azbridge -l log.txt -f $_LOCALCONFIG >> ~/testoutput.log 2>&1 &
LOCAL_LISTENER_PID=$!
_REMOTECONFIG=$(mktemp)
cat test_nc_config_ping_pong.remote.yml > $_REMOTECONFIG
echo AzureRelayConnectionString : "$AZBRIDGE_TEST_CXNSTRING" >> $_REMOTECONFIG
/usr/share/azbridge/azbridge -f $_REMOTECONFIG >> ~/testoutput.log 2>&1 &
/usr/share/azbridge/azbridge -l log.txt -f $_REMOTECONFIG >> ~/testoutput.log 2>&1 &
REMOTE_LISTENER_PID=$!
sleep 5
#expected request: ping

4
test/docker/test_nc_ping_pong.sh
Просмотреть файл

@ -1,9 +1,9 @@
#!/bin/bash
rm -f ~/testoutput.log
/usr/share/azbridge/azbridge -x $AZBRIDGE_TEST_CXNSTRING -L 127.0.8.1:8888/test:a1 >> ~/testoutput.log 2>&1 &
/usr/share/azbridge/azbridge -l log.txt -x $AZBRIDGE_TEST_CXNSTRING -L 127.0.8.1:8888/test:a1 >> ~/testoutput.log 2>&1 &
LOCAL_LISTENER_PID=$!
/usr/share/azbridge/azbridge -x $AZBRIDGE_TEST_CXNSTRING -R a1:test/9999 >> ~/testoutput.log 2>&1 &
/usr/share/azbridge/azbridge -l log.txt -x $AZBRIDGE_TEST_CXNSTRING -R a1:test/9999 >> ~/testoutput.log 2>&1 &
REMOTE_LISTENER_PID=$!
sleep 5
#expected request: ping

12
test/docker/ubuntu/Test.proj
Просмотреть файл

@ -5,15 +5,15 @@
</PropertyGroup>
<Target Name="Build">
<Exec Command="build.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="build.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./build.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="VSTest">
<Exec Command="test.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="test.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="Clean">
<Exec Command="clean.cmd $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(BuildNumber) $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
<Exec Command="clean.cmd $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./clean.sh $(VersionPrefix) $(VersionSuffix) $(TargetFramework)" Condition="'$(OS)'=='Unix'"/>
</Target>
</Project>

8
test/docker/ubuntu/build.cmd
Просмотреть файл

@ -1,11 +1,9 @@
@echo off
if not "%1" == "" set BuildNumber=%1
if not "%2" == "" set VersionPrefix=%2
if not "%3" == "" set VersionSuffix=%3
if not "%4" == "" set TargetFramework=%4
if not "%1" == "" set VersionPrefix=%1
if not "%2" == "" set VersionSuffix=%2
if not "%3" == "" set TargetFramework=%3
if "%BuildNumber%"=="" set BuildNumber=0000
if "%VersionSuffix%"=="" set VersionSuffix=preview
if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
if "%TargetFramework%"=="" set TargetFramework="netcoreapp3.0"

8
test/docker/ubuntu/build.sh
Просмотреть файл

@ -1,11 +1,9 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

8
test/docker/ubuntu/test.sh
Просмотреть файл

@ -1,12 +1,10 @@
#!/bin/bash
if [ ! -z $1 ]; then BuildNumber=$1; fi
if [ ! -z $2 ]; then VersionPrefix=$2; fi
if [ ! -z $3 ]; then VersionSuffix=$3; fi
if [ ! -z $4 ]; then TargetFramework=$4; fi
if [ ! -z $1 ]; then VersionPrefix=$1; fi
if [ ! -z $2 ]; then VersionSuffix=$2; fi
if [ ! -z $3 ]; then TargetFramework=$3; fi
if [ -z ${BuildNumber+x} ]; then BuildNumber='0000'; fi
if [ -z ${VersionSuffix+x} ]; then VersionSuffix='preview'; fi
if [ -z ${VersionPrefix+x} ]; then VersionPrefix='1.0.0'; fi
if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi

2
test/unit/Microsoft.Azure.Relay.Bridge.Tests/ConfigTest.cs
Просмотреть файл

@ -126,7 +126,7 @@ namespace Microsoft.Azure.Relay.Bridge.Test
[Fact]
public void CommandLineBadArgumentTest()
{
var ex = Assert.Throws<CommandParsingException>(() =>
var ex = Assert.Throws<UnrecognizedCommandParsingException>(() =>
{
CommandLineSettings.Run(new string[] { "-bad" },
(settings) => { return 0; });

2
test/unit/Microsoft.Azure.Relay.Bridge.Tests/Microsoft.Azure.Relay.Bridge.Tests.csproj
Просмотреть файл

@ -25,7 +25,7 @@
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
<PackageReference Include="YamlDotNet.Signed" Version="$(YamlDotnetSignedPackageVersion)" />
<DotNetCliToolReference Include="dotnet-xunit" Version="$(DotnetXunitPackageVersion)" />
<!--<DotNetCliToolReference Include="dotnet-xunit" Version="$(DotnetXunitPackageVersion)" />-->
</ItemGroup>
<ItemGroup>

8
verify-build.cmd
Просмотреть файл

@ -1,10 +1,10 @@
pushd "%~dp0"
set xunitrunner=%userprofile%\.nuget\packages\dotnet-xunit\2.3.1\tools\net452\xunit.console.exe
%xunitrunner% -? 2>&1 > NUL
set xunitrunner=xunit.console.exe
where %xunitrunner% 2>&1
if ERRORLEVEL 1 set xunitrunner=C:\Tools\xUnit20\xunit.console.exe
"%xunitrunner%" "test\unit\Microsoft.Azure.Relay.Bridge.Tests\bin\Debug\net462\Microsoft.Azure.Relay.Bridge.Tests.dll" -appveyor
rem cd test\docker
rem msbuild /t:clean,build,vstest
cd test\docker
msbuild /t:clean,build,vstest
popd

1
verify-build.sh
Просмотреть файл

@ -1,6 +1,5 @@
#!/bin/bash
if [ ! -z $APPVEYOR_BUILD_NUMBER ]; then _BuildProp="/p:BuildNumber=$APPVEYOR_BUILD_NUMBER"; fi
if [ ! -z $APPVEYOR_BUILD_VERSION ]; then _VersionProp="/p:VersionPrefix=$APPVEYOR_BUILD_VERSION"; fi
dotnet test --verbosity=normal

5
version.props
Просмотреть файл

@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>0.1.1</VersionPrefix>
<BuildNumber></BuildNumber>
<VersionSuffix>preview</VersionSuffix>
<VersionPrefix>0.2.1</VersionPrefix>
<VersionSuffix>rtm</VersionSuffix>
</PropertyGroup>
</Project>