upgrade to .NET Core 3.0

Signed-off-by: Clemens Vasters <clemensv@microsoft.com>

.appveyor.yml

@@ -1,6 +1,10 @@
 version: '0.1.3-{build}'
 init:
 - git config --global core.autocrlf true
+matrix:
+  fast_finish: true
+  - image: Visual Studio 2017
+  - image: Ubuntu
 branches:
   only:
   - master
@@ -23,9 +27,6 @@ test_script:
   - cmd: .\verify-build.cmd
   - sh: docker login -u $DOCKER_USER -p $DOCKER_PASS
   - sh: ./verify-build.sh
-image: 
-  - Visual Studio 2017
-  - Ubuntu
 artifacts:
   - path: 'artifacts\build\**\*.tar.gz'
   - path: 'artifacts\build\**\*.zip'

Directory.Build.props

@@ -11,7 +11,7 @@
 <PropertyGroup>
       <WindowsOnly>false</WindowsOnly>
       <WindowsFrameworks Condition="'$(OS)'=='Windows_NT'">net462;</WindowsFrameworks>
-      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp2.1</CoreFrameworks>
+      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp3.0</CoreFrameworks>
       <TargetFrameworks>$(WindowsFrameworks)$(CoreFrameworks)</TargetFrameworks>
       <WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win7-x64;win7-x86;win10-x64;win10-x86;</WindowsRuntimeIdentifiers>
       <UnixRuntimeIdentifiers Condition="'$(WindowsOnly)'=='false'">osx-x64;debian.8-x64;ubuntu.16.10-x64;ubuntu.16.04-x64;opensuse-x64;ol-x64;rhel-x64;fedora-x64;centos-x64</UnixRuntimeIdentifiers>

Directory.Build.targets

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

Dockerfile

@@ -15,7 +15,7 @@ RUN dotnet build azbridge.csproj
 
 FROM build AS publish
 WORKDIR /azure-relay-bridge/src/azbridge
-RUN dotnet publish azbridge.csproj -c Release -f netcoreapp2.1 -o /app
+RUN dotnet publish azbridge.csproj -c Release -f netcoreapp3.0 -o /app
 
 
 FROM mcr.microsoft.com/dotnet/core/runtime:2.1

NuGetPackageVerifier.json

@@ -5,8 +5,7 @@
             "azbridge": {
                 "Exclusions": {
                   "DOC_MISSING": {
-                    "lib/netcoreapp2.0/azbridge.dll": "no public API",
+                    "lib/netcoreapp3.0/azbridge.dll": "no public API"
-                    "lib/netcoreapp2.1/azbridge.dll": "no public API"
                   }
                 }
               }

build/dependencies.props

@@ -12,8 +12,7 @@
     <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
     <MicrosoftDiagnosticsTracingEventSourcePackageVersion>1.1.28</MicrosoftDiagnosticsTracingEventSourcePackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.22</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
+    <MicrosoftNETCoreApp30PackageVersion>2.0.0</MicrosoftNETCoreApp30PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.0</MicrosoftNETCoreApp21PackageVersion>
     <MicrosoftNetHttpHeadersPackageVersion>2.1.0</MicrosoftNetHttpHeadersPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>

build/repo.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
       <WindowsOnly>false</WindowsOnly>
       <WindowsFrameworks Condition="'$(OS)'=='Windows_NT'">net462;</WindowsFrameworks>
-      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp2.1</CoreFrameworks>
+      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp3.0</CoreFrameworks>
       <TargetFrameworks>$(WindowsFrameworks)$(CoreFrameworks)</TargetFrameworks>
       <WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win7-x64;win7-x86;win10-x64;win10-x86;</WindowsRuntimeIdentifiers>
       <UnixRuntimeIdentifiers Condition="'$(WindowsOnly)'=='false'">osx-x64;debian.8-x64;ubuntu.16.10-x64;ubuntu.16.04-x64;opensuse-x64;ol-x64;rhel-x64;fedora-x64;centos-x64</UnixRuntimeIdentifiers>
@@ -11,8 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
   </ItemGroup>
 </Project>

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=netcoreapp2.1 %*
+  docker run --rm -v %cd%:/build microsoft/dotnet:2.1-sdk /build/package.sh /p:TargetFramework=netcoreapp3.0 %*
 )

package.sh

@@ -3,6 +3,6 @@ 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=netcoreapp2.1 $_BuildProp $_VersionProp $@
+dotnet msbuild /t:clean,restore,build /p:Configuration=Debug /p:TargetFramework=netcoreapp3.0 $_BuildProp $_VersionProp $@
-dotnet msbuild /t:clean,restore,build,package /p:Configuration=Release /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
+dotnet msbuild /t:clean,restore,build,package /p:Configuration=Release /p:TargetFramework=netcoreapp3.0 $_BuildProp $_VersionProp $@
 popd

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

@@ -3,7 +3,7 @@
 <PropertyGroup>
       <WindowsOnly>false</WindowsOnly>
       <WindowsFrameworks Condition="'$(OS)'=='Windows_NT'">net462;</WindowsFrameworks>
-      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp2.1</CoreFrameworks>
+      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp3.0</CoreFrameworks>
       <TargetFrameworks>$(WindowsFrameworks)$(CoreFrameworks)</TargetFrameworks>
       <WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win7-x64;win7-x86;win10-x64;win10-x86;</WindowsRuntimeIdentifiers>
       <UnixRuntimeIdentifiers Condition="'$(WindowsOnly)'=='false'">osx-x64;debian.8-x64;ubuntu.16.10-x64;ubuntu.16.04-x64;opensuse-x64;ol-x64;rhel-x64;fedora-x64;centos-x64</UnixRuntimeIdentifiers>

src/azbridge/azbridge.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <WindowsOnly>false</WindowsOnly>
     <WindowsFrameworks Condition="'$(OS)'=='Windows_NT'">net462;</WindowsFrameworks>
-    <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp2.1</CoreFrameworks>
+    <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp3.0</CoreFrameworks>
     <TargetFrameworks>$(WindowsFrameworks)$(CoreFrameworks)</TargetFrameworks>
     <!-- <TargetFrameworks>$(CoreFrameworks)</TargetFrameworks> -->
     <WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win7-x64;win7-x86;win10-x64;win10-x86;</WindowsRuntimeIdentifiers>
@@ -124,8 +124,6 @@
     <RpmDependency Include="krb5-libs" Version="" />
     <RpmDependency Include="libicu" Version="" />
     <RpmDependency Include="zlib" Version="" />
-    <RpmDependency Include="libunwind" Version="" Condition="'$(TargetFramework)'=='netcoreapp2.0'" />
-    <RpmDependency Include="libuuid" Version="" Condition="'$(TargetFramework)'=='netcoreapp2.0'" />
   </ItemGroup>
 
   <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('debian')) OR $(RuntimeIdentifier.StartsWith('ubuntu')) OR $(RuntimeIdentifier.StartsWith('linuxmint'))">
@@ -138,8 +136,6 @@
     <DebDependency Include="libicu55" Version="" Condition="'$(RuntimeIdentifier)'=='ubuntu.16'" />
     <DebDependency Include="libicu57" Version="" Condition="'$(RuntimeIdentifier)'=='debian.9' OR '$(RuntimeIdentifier)'=='ubuntu.17' OR '$(RuntimeIdentifier)'=='linuxmint.17'" />
     <DebDependency Include="libicu60" Version="" Condition="'$(RuntimeIdentifier)'=='debian.10' OR '$(RuntimeIdentifier)'=='ubuntu.18' OR '$(RuntimeIdentifier)'=='linuxmint.18'" />
-    <DebDependency Include="libunwind8" Version="" Condition="'$(TargetFramework)'=='netcoreapp2.0'" />
-    <DebDependency Include="libuuid1" Version="" Condition="'$(TargetFramework)'=='netcoreapp2.0'" />
   </ItemGroup>
 
   <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith('debian')) OR $(RuntimeIdentifier.StartsWith('ubuntu')) OR $(RuntimeIdentifier.StartsWith('linuxmint'))">
@@ -188,13 +184,13 @@
   <Target Name="PackageZip" DependsOnTargets="CreateZip" Condition="$(RuntimeIdentifier.EndsWith($(PlatformTarget)))">
     <Copy SourceFiles="$(ZipPath)" DestinationFolder="$(BuildDir)/$(TargetFramework)" />
   </Target>
-  <Target Name="PackageTarball" DependsOnTargets="CreateTarball" Condition="('$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'netcoreapp2.1') AND $(UnixRuntimeIdentifiers.Contains($(RuntimeIdentifier)))">
+  <Target Name="PackageTarball" DependsOnTargets="CreateTarball" Condition="('$(TargetFramework)' == 'netcoreapp3.0') AND $(UnixRuntimeIdentifiers.Contains($(RuntimeIdentifier)))">
     <Copy SourceFiles="$(TarballPath)" DestinationFolder="$(BuildDir)/$(TargetFramework)" />
   </Target>
-  <Target Name="PackageDebian" DependsOnTargets="CreateDeb" Condition="'$(OS)' == 'Unix' AND ('$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'netcoreapp2.1') AND ($(RuntimeIdentifier.StartsWith('ubuntu')) OR $(RuntimeIdentifier.StartsWith('debian')) OR $(RuntimeIdentifier.StartsWith('linuxmint')))">
+  <Target Name="PackageDebian" DependsOnTargets="CreateDeb" Condition="'$(OS)' == 'Unix' AND ('$(TargetFramework)' == 'netcoreapp3.0') AND ($(RuntimeIdentifier.StartsWith('ubuntu')) OR $(RuntimeIdentifier.StartsWith('debian')) OR $(RuntimeIdentifier.StartsWith('linuxmint')))">
     <Copy SourceFiles="$(DebPath)" DestinationFolder="$(BuildDir)/$(TargetFramework)" />
   </Target>
-  <Target Name="PackageRpm" DependsOnTargets="CreateRpm" Condition="'$(OS)' == 'Unix' AND ('$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'netcoreapp2.1') AND ($(RuntimeIdentifier.StartsWith('rhel')) OR $(RuntimeIdentifier.StartsWith('centos')) OR $(RuntimeIdentifier.StartsWith('fedora')) OR $(RuntimeIdentifier.StartsWith('opensuse')) OR $(RuntimeIdentifier.StartsWith('ol')))">
+  <Target Name="PackageRpm" DependsOnTargets="CreateRpm" Condition="'$(OS)' == 'Unix' AND ('$(TargetFramework)' == 'netcoreapp3.0') AND ($(RuntimeIdentifier.StartsWith('rhel')) OR $(RuntimeIdentifier.StartsWith('centos')) OR $(RuntimeIdentifier.StartsWith('fedora')) OR $(RuntimeIdentifier.StartsWith('opensuse')) OR $(RuntimeIdentifier.StartsWith('ol')))">
     <Copy SourceFiles="$(RpmPath)" DestinationFolder="$(BuildDir)/$(TargetFramework)" />
   </Target>
   <Target Name="PackageWindows" DependsOnTargets="Publish" Condition="'$(OS)' == 'Windows_NT' AND '$(TargetFramework)' == 'net462' AND $(RuntimeIdentifier.StartsWith('win')) AND $(RuntimeIdentifier.EndsWith($(PlatformTarget)))">
@@ -208,7 +204,7 @@
     <Exec Command="&quot;$(MSBuildToolsPath32)\msbuild&quot; ../azbridge-installer/azbridge-installer.wixproj /t:Publish /p:TargetFramework=$(TargetFramework);RuntimeIdentifier=$(RuntimeIdentifier);BridgeProjectFile=$(MSBuildProjectFullPath);BridgePublishPath=$(MSBuildProjectDirectory)\$(PublishDir);OutputPath=$(MSBuildProjectDirectory)\$(MsiDir);OutputName=$(_OutputName);AlreadyPublished=true" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\$(MsiDir)\$(_OutputName).msi" DestinationFolder="$(BuildDir)/$(TargetFramework)" />
   </Target>
-  <Target Name="PackageOSX" DependsOnTargets="Publish" Condition="'$(OS)' == 'Unix' AND ('$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'netcoreapp2.1') AND ($(RuntimeIdentifier.StartsWith('osx')))">
+  <Target Name="PackageOSX" DependsOnTargets="Publish" Condition="'$(OS)' == 'Unix' AND ('$(TargetFramework)' == 'netcoreapp3.0') AND ($(RuntimeIdentifier.StartsWith('osx')))">
 
   </Target>
   <Target Name="PublishPackages" DependsOnTargets="PackageDebian;PackageRpm;PackageWindows;PackageOSX;PackageZip;PackageTarball" Condition=" '$(RuntimeIdentifier)' != ''">

test/docker/centos/build.cmd

@@ -8,7 +8,7 @@ if not "%4" == "" set TargetFramework=%4
 if "%BuildNumber%"=="" set BuildNumber=0000
 if "%VersionSuffix%"=="" set VersionSuffix=preview
 if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
-if "%TargetFramework%"=="" set TargetFramework=netcoreapp2.1
+if "%TargetFramework%"=="" set TargetFramework=netcoreapp3.0
 
 pushd "%~dp0"
 if not exist "tmp" mkdir tmp

test/docker/centos/build.sh

@@ -9,7 +9,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 if [ ! -d "tmp" ]; then mkdir tmp; fi

test/docker/centos/test.sh

@@ -9,7 +9,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 IMAGE_NAME=azbridge_centos_test

test/docker/debian/build.cmd

@@ -8,7 +8,7 @@ if not "%4" == "" set TargetFramework=%4
 if "%BuildNumber%"=="" set BuildNumber=0000
 if "%VersionSuffix%"=="" set VersionSuffix=preview
 if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
-if "%TargetFramework%"=="" set TargetFramework="netcoreapp2.1"
+if "%TargetFramework%"=="" set TargetFramework="netcoreapp3.0"
 
 pushd "%~dp0"
 if not exist "tmp" mkdir tmp

test/docker/debian/build.sh

@@ -8,7 +8,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 if [ ! -d "tmp" ]; then mkdir tmp; fi

test/docker/debian/test.sh

@@ -9,7 +9,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 IMAGE_NAME=azbridge_debian8_test

test/docker/fedora/build.cmd

@@ -8,7 +8,7 @@ if not "%4" == "" set TargetFramework=%4
 if "%BuildNumber%"=="" set BuildNumber=0000
 if "%VersionSuffix%"=="" set VersionSuffix=preview
 if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
-if "%TargetFramework%"=="" set TargetFramework="netcoreapp2.1"
+if "%TargetFramework%"=="" set TargetFramework="netcoreapp3.0"
 
 pushd "%~dp0"
 if not exist "tmp" mkdir tmp

test/docker/fedora/build.sh

@@ -8,7 +8,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 if [ ! -d "tmp" ]; then mkdir tmp; fi

test/docker/fedora/test.sh

@@ -9,7 +9,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 

test/docker/ubuntu/build.cmd

@@ -8,7 +8,7 @@ if not "%4" == "" set TargetFramework=%4
 if "%BuildNumber%"=="" set BuildNumber=0000
 if "%VersionSuffix%"=="" set VersionSuffix=preview
 if "%VersionPrefix%"=="" set VersionPrefix=1.0.0
-if "%TargetFramework%"=="" set TargetFramework="netcoreapp2.1"
+if "%TargetFramework%"=="" set TargetFramework="netcoreapp3.0"
 
 pushd "%~dp0"
 if not exist "tmp" mkdir tmp

test/docker/ubuntu/build.sh

@@ -8,7 +8,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 if [ ! -d "tmp" ]; then mkdir tmp; fi

test/docker/ubuntu/test.sh

@@ -9,7 +9,7 @@ if [ ! -z $4 ]; then TargetFramework=$4; 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='netcoreapp2.1'; fi
+if [ -z ${TargetFramework+x} ]; then TargetFramework='netcoreapp3.0'; fi
 
 pushd "${0%/*}" > /dev/null 
 

test/unit/Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
+    <DeveloperBuildTestTfms>netcoreapp3.0</DeveloperBuildTestTfms>
     <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
     <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
     <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>

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

@@ -3,7 +3,7 @@
    <PropertyGroup>
       <WindowsOnly>false</WindowsOnly>
       <WindowsFrameworks Condition="'$(OS)'=='Windows_NT'">net462;</WindowsFrameworks>
-      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp2.1</CoreFrameworks>
+      <CoreFrameworks Condition="'$(WindowsOnly)'!='true'">netcoreapp3.0</CoreFrameworks>
       <TargetFrameworks>$(WindowsFrameworks)$(CoreFrameworks)</TargetFrameworks>
       <!-- <TargetFrameworks>$(CoreFrameworks)</TargetFrameworks> -->
       <WindowsRuntimeIdentifiers Condition="'$(OS)'=='Windows_NT'">win7-x64;win7-x86;win10-x64;win10-x86;</WindowsRuntimeIdentifiers>

verify-build.sh

@@ -5,6 +5,6 @@ if [ ! -z $APPVEYOR_BUILD_VERSION ]; then _VersionProp="/p:VersionPrefix=$APPVEY
 
 dotnet test --verbosity=normal
 cd test/docker
-dotnet clean --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
+dotnet clean --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp3.0 $_BuildProp $_VersionProp $@
-dotnet build --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
+dotnet build --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp3.0 $_BuildProp $_VersionProp $@
-dotnet test --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp2.1 $_BuildProp $_VersionProp $@
+dotnet test --verbosity=normal /p:Configuration=Debug /p:TargetFramework=netcoreapp3.0 $_BuildProp $_VersionProp $@