This commit is contained in:
Clemens Vasters 2018-07-13 22:15:09 +02:00
Родитель 954c38f50c
Коммит 16cfc8ead8
3 изменённых файлов: 20 добавлений и 14 удалений

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

@ -23,8 +23,8 @@ deploy: 'off'
test_script:
- cmd: docker login -u="%DOCKER_USER%" -p="%DOCKER_PASS%"
- cmd: .\verify-build.cmd
# - sh: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
# - sh: ./verify-build.sh
- sh: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
- sh: ./verify-build.sh
image:
- Visual Studio 2017
- Ubuntu

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

@ -137,15 +137,18 @@ namespace Microsoft.Azure.Relay.Bridge.Configuration
set
{
var val = value != null ? value.Trim('\'', '\"') : value;
foreach (var ch in val)
if (val != null)
{
if (!char.IsLetterOrDigit(ch) &&
ch != '-' && ch != '_')
foreach (var ch in val)
{
throw BridgeEventSource.Log.ArgumentOutOfRange(
nameof(AzureRelaySharedAccessKeyName),
$"Invalid -K/AzureRelaySharedAccessKeyName value {val}",
this);
if (!char.IsLetterOrDigit(ch) &&
ch != '-' && ch != '_')
{
throw BridgeEventSource.Log.ArgumentOutOfRange(
nameof(AzureRelaySharedAccessKeyName),
$"Invalid -K/AzureRelaySharedAccessKeyName value {val}",
this);
}
}
}
RelayConnectionStringBuilder.SharedAccessKeyName = val;
@ -163,7 +166,10 @@ namespace Microsoft.Azure.Relay.Bridge.Configuration
var val = value != null ? value.Trim('\'', '\"') : value;
try
{
Convert.FromBase64String(val);
if (val != null)
{
Convert.FromBase64String(val);
}
RelayConnectionStringBuilder.SharedAccessKey = val;
}
catch (FormatException e)

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

@ -3,8 +3,8 @@
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 ~/.nuget/packages/dotnet-xunit/2.3.1/tools/netcoreapp2.0/xunit.console.dll test/unit/Microsoft.Azure.Relay.Bridge.Tests/bin/Debug/netcoreapp2.1/Microsoft.Azure.Relay.Bridge.Tests.dll -appveyor
dotnet test --verbosity=normal
cd test/docker
dotnet clean /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
dotnet build /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
dotnet test /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
dotnet clean --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
dotnet build --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
dotnet test --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@