Migrate to the new .csproj project system

aspnet-contrib · Mar 20, 2017 · fbe8bf6 · fbe8bf6
1 parent 66b99e9
commit fbe8bf6
Show file tree

Hide file tree

Showing 62 changed files with 597 additions and 1,249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 target/
 .nuget/
 .vs/
+.build/
 
 # User-specific files
 *.suo
@@ -18,7 +19,6 @@ project.lock.json
 [Dd]ebug/
 [Rr]elease/
 x64/
-build/
 [Bb]in/
 [Oo]bj/
 
@@ -159,4 +159,4 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # Mac desktop service store files
-.DS_Store
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,15 @@ addons:
     - libssl-dev
     - libunwind8
     - zlib1g
-mono:
-  - alpha
-  - latest
+env:
+  global:
+    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+mono: none
+os:
+  - linux
+  - osx
+before_install:
+  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
 script:
-  - ./build.sh verify
+  - ./build.sh
diff --git a/AspNet.Security.OpenIdConnect.Server.sln b/AspNet.Security.OpenIdConnect.Server.sln
@@ -1,47 +1,47 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Server", "src\AspNet.Security.OpenIdConnect.Server\AspNet.Security.OpenIdConnect.Server.xproj", "{0512E28E-343F-412A-8ADC-0256E07D78DD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{630C29B2-7346-47B1-A3AD-B2D8C0464A9A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mvc.Client", "samples\Mvc\Mvc.Client\Mvc.Client.xproj", "{68631868-902A-46FB-9A44-BACF1812FBDE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FF6097D2-F92B-4AA8-A547-AE90C25DC7AC}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mvc.Server", "samples\Mvc\Mvc.Server\Mvc.Server.xproj", "{440B6A0C-05F3-4483-B4AA-FB0BC4B239FF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nancy", "Nancy", "{EA16048E-A9C0-4213-8892-491D3049449C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{630C29B2-7346-47B1-A3AD-B2D8C0464A9A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc", "Mvc", "{1502EA4B-8F4B-4F0D-B337-33AF09FF660F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FF6097D2-F92B-4AA8-A547-AE90C25DC7AC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{96FF51F9-A2F3-4DBB-B825-A3FC16747697}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Extensions", "src\AspNet.Security.OpenIdConnect.Extensions\AspNet.Security.OpenIdConnect.Extensions.xproj", "{BA895C47-20DA-4A21-924D-5E5768055359}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Server", "src\AspNet.Security.OpenIdConnect.Server\AspNet.Security.OpenIdConnect.Server.csproj", "{0512E28E-343F-412A-8ADC-0256E07D78DD}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Owin.Security.OpenIdConnect.Extensions", "src\Owin.Security.OpenIdConnect.Extensions\Owin.Security.OpenIdConnect.Extensions.xproj", "{169AF883-34C4-4A39-85F7-13C94AD9D678}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Client", "samples\Mvc\Mvc.Client\Mvc.Client.csproj", "{68631868-902A-46FB-9A44-BACF1812FBDE}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Owin.Security.OpenIdConnect.Server", "src\Owin.Security.OpenIdConnect.Server\Owin.Security.OpenIdConnect.Server.xproj", "{84A2AA3D-F33A-4908-AEBE-6653CDA75844}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Server", "samples\Mvc\Mvc.Server\Mvc.Server.csproj", "{440B6A0C-05F3-4483-B4AA-FB0BC4B239FF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nancy", "Nancy", "{EA16048E-A9C0-4213-8892-491D3049449C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Extensions", "src\AspNet.Security.OpenIdConnect.Extensions\AspNet.Security.OpenIdConnect.Extensions.csproj", "{BA895C47-20DA-4A21-924D-5E5768055359}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Client", "samples\Nancy\Nancy.Client\Nancy.Client.xproj", "{922B11BE-16FF-4CD8-9C42-DD59613C1389}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Owin.Security.OpenIdConnect.Extensions", "src\Owin.Security.OpenIdConnect.Extensions\Owin.Security.OpenIdConnect.Extensions.csproj", "{169AF883-34C4-4A39-85F7-13C94AD9D678}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Server", "samples\Nancy\Nancy.Server\Nancy.Server.xproj", "{E970D74E-B32C-4323-8A22-92862AEA5344}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Owin.Security.OpenIdConnect.Server", "src\Owin.Security.OpenIdConnect.Server\Owin.Security.OpenIdConnect.Server.csproj", "{84A2AA3D-F33A-4908-AEBE-6653CDA75844}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc", "Mvc", "{1502EA4B-8F4B-4F0D-B337-33AF09FF660F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Client", "samples\Nancy\Nancy.Client\Nancy.Client.csproj", "{922B11BE-16FF-4CD8-9C42-DD59613C1389}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{96FF51F9-A2F3-4DBB-B825-A3FC16747697}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Server", "samples\Nancy\Nancy.Server\Nancy.Server.csproj", "{E970D74E-B32C-4323-8A22-92862AEA5344}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Extensions.Tests", "test\AspNet.Security.OpenIdConnect.Extensions.Tests\AspNet.Security.OpenIdConnect.Extensions.Tests.xproj", "{8F443F73-CA00-425C-B74C-98E0D91DCD71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Extensions.Tests", "test\AspNet.Security.OpenIdConnect.Extensions.Tests\AspNet.Security.OpenIdConnect.Extensions.Tests.csproj", "{8F443F73-CA00-425C-B74C-98E0D91DCD71}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Server.Tests", "test\AspNet.Security.OpenIdConnect.Server.Tests\AspNet.Security.OpenIdConnect.Server.Tests.xproj", "{FAD212A8-1FD4-4E8C-96B2-152F2F1C26F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Server.Tests", "test\AspNet.Security.OpenIdConnect.Server.Tests\AspNet.Security.OpenIdConnect.Server.Tests.csproj", "{FAD212A8-1FD4-4E8C-96B2-152F2F1C26F3}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Owin.Security.OpenIdConnect.Extensions.Tests", "test\Owin.Security.OpenIdConnect.Extensions.Tests\Owin.Security.OpenIdConnect.Extensions.Tests.xproj", "{88D8F453-51C3-40F2-9C8A-E1F91A7D3C43}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Owin.Security.OpenIdConnect.Extensions.Tests", "test\Owin.Security.OpenIdConnect.Extensions.Tests\Owin.Security.OpenIdConnect.Extensions.Tests.csproj", "{88D8F453-51C3-40F2-9C8A-E1F91A7D3C43}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Owin.Security.OpenIdConnect.Server.Tests", "test\Owin.Security.OpenIdConnect.Server.Tests\Owin.Security.OpenIdConnect.Server.Tests.xproj", "{5A12ABFF-FC41-43B6-8C57-97309198B6FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Owin.Security.OpenIdConnect.Server.Tests", "test\Owin.Security.OpenIdConnect.Server.Tests\Owin.Security.OpenIdConnect.Server.Tests.csproj", "{5A12ABFF-FC41-43B6-8C57-97309198B6FF}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Primitives", "src\AspNet.Security.OpenIdConnect.Primitives\AspNet.Security.OpenIdConnect.Primitives.xproj", "{EFC8FA3D-2361-4808-A52C-E1690D41A6D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Primitives", "src\AspNet.Security.OpenIdConnect.Primitives\AspNet.Security.OpenIdConnect.Primitives.csproj", "{EFC8FA3D-2361-4808-A52C-E1690D41A6D9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Primitives.Tests", "test\AspNet.Security.OpenIdConnect.Primitives.Tests\AspNet.Security.OpenIdConnect.Primitives.Tests.xproj", "{7BDA3A43-9335-4004-977A-BFB2EC7683A1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Primitives.Tests", "test\AspNet.Security.OpenIdConnect.Primitives.Tests\AspNet.Security.OpenIdConnect.Primitives.Tests.csproj", "{7BDA3A43-9335-4004-977A-BFB2EC7683A1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNet.Security.OpenIdConnect.Client", "src\AspNet.Security.OpenIdConnect.Client\AspNet.Security.OpenIdConnect.Client.xproj", "{107D65D4-FA06-4B51-88B6-BFE1FDF8972D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet.Security.OpenIdConnect.Client", "src\AspNet.Security.OpenIdConnect.Client\AspNet.Security.OpenIdConnect.Client.csproj", "{107D65D4-FA06-4B51-88B6-BFE1FDF8972D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -114,16 +114,16 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{EA16048E-A9C0-4213-8892-491D3049449C} = {FF6097D2-F92B-4AA8-A547-AE90C25DC7AC}
+		{1502EA4B-8F4B-4F0D-B337-33AF09FF660F} = {FF6097D2-F92B-4AA8-A547-AE90C25DC7AC}
 		{0512E28E-343F-412A-8ADC-0256E07D78DD} = {630C29B2-7346-47B1-A3AD-B2D8C0464A9A}
 		{68631868-902A-46FB-9A44-BACF1812FBDE} = {1502EA4B-8F4B-4F0D-B337-33AF09FF660F}
 		{440B6A0C-05F3-4483-B4AA-FB0BC4B239FF} = {1502EA4B-8F4B-4F0D-B337-33AF09FF660F}
 		{BA895C47-20DA-4A21-924D-5E5768055359} = {630C29B2-7346-47B1-A3AD-B2D8C0464A9A}
 		{169AF883-34C4-4A39-85F7-13C94AD9D678} = {630C29B2-7346-47B1-A3AD-B2D8C0464A9A}
 		{84A2AA3D-F33A-4908-AEBE-6653CDA75844} = {630C29B2-7346-47B1-A3AD-B2D8C0464A9A}
-		{EA16048E-A9C0-4213-8892-491D3049449C} = {FF6097D2-F92B-4AA8-A547-AE90C25DC7AC}
 		{922B11BE-16FF-4CD8-9C42-DD59613C1389} = {EA16048E-A9C0-4213-8892-491D3049449C}
 		{E970D74E-B32C-4323-8A22-92862AEA5344} = {EA16048E-A9C0-4213-8892-491D3049449C}
-		{1502EA4B-8F4B-4F0D-B337-33AF09FF660F} = {FF6097D2-F92B-4AA8-A547-AE90C25DC7AC}
 		{8F443F73-CA00-425C-B74C-98E0D91DCD71} = {96FF51F9-A2F3-4DBB-B825-A3FC16747697}
 		{FAD212A8-1FD4-4E8C-96B2-152F2F1C26F3} = {96FF51F9-A2F3-4DBB-B825-A3FC16747697}
 		{88D8F453-51C3-40F2-9C8A-E1F91A7D3C43} = {96FF51F9-A2F3-4DBB-B825-A3FC16747697}

diff --git a/build.cmd b/build.cmd
@@ -1,2 +1,2 @@
 @ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"
+PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"
diff --git a/build.ps1 b/build.ps1
@@ -1,9 +1,39 @@
+$ErrorActionPreference = "Stop"
+
+function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
+{
+    while($true)
+    {
+        try
+        {
+            Invoke-WebRequest $url -OutFile $downloadLocation
+            break
+        }
+        catch
+        {
+            $exceptionMessage = $_.Exception.Message
+            Write-Host "Failed to download '$url': $exceptionMessage"
+            if ($retries -gt 0) {
+                $retries--
+                Write-Host "Waiting 10 seconds before retrying. Retries left: $retries"
+                Start-Sleep -Seconds 10
+
+            }
+            else
+            {
+                $exception = $_.Exception
+                throw $exception
+            }
+        }
+    }
+}
+
 cd $PSScriptRoot
 
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP
@@ -13,17 +43,18 @@ $buildFolder = ".build"
 $buildFile="$buildFolder\KoreBuild.ps1"
 
 if (!(Test-Path $buildFolder)) {
-    Write-Host "Downloading KoreBuild from $koreBuildZip"    
-    
+    Write-Host "Downloading KoreBuild from $koreBuildZip"
+
     $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
     New-Item -Path "$tempFolder" -Type directory | Out-Null
 
     $localZipFile="$tempFolder\korebuild.zip"
-
-    Invoke-WebRequest $koreBuildZip -OutFile $localZipFile
+
+    DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
+
     Add-Type -AssemblyName System.IO.Compression.FileSystem
     [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
-    
+
     New-Item -Path "$buildFolder" -Type directory | Out-Null
     copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
 
@@ -33,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
     }
 }
 
-&"$buildFile" $args
+&"$buildFile" @args
diff --git a/build.sh b/build.sh
@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi
@@ -12,24 +12,35 @@ buildFile="$buildFolder/KoreBuild.sh"
 
 if test ! -d $buildFolder; then
     echo "Downloading KoreBuild from $koreBuildZip"
-    
-    tempFolder="/tmp/KoreBuild-$(uuidgen)"    
+
+    tempFolder="/tmp/KoreBuild-$(uuidgen)"
     mkdir $tempFolder
-    
+
     localZipFile="$tempFolder/korebuild.zip"
-
-    wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip /dev/null
+
+    retries=6
+    until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null)
+    do
+        echo "Failed to download '$koreBuildZip'"
+        if [ "$retries" -le 0 ]; then
+            exit 1
+        fi
+        retries=$((retries - 1))
+        echo "Waiting 10 seconds before retrying. Retries left: $retries"
+        sleep 10s
+    done
+
     unzip -q -d $tempFolder $localZipFile
-  
+
     mkdir $buildFolder
     cp -r $tempFolder/**/build/** $buildFolder
-    
+
     chmod +x $buildFile
-    
+
     # Cleanup
-    if test ! -d $tempFolder; then
-        rm -rf $tempFolder  
+    if test -d $tempFolder; then
+        rm -rf $tempFolder
     fi
 fi
 
-$buildFile -r $repoFolder "$@"
+$buildFile -r $repoFolder "$@"
diff --git a/build/common.props b/build/common.props
@@ -0,0 +1,22 @@
+<Project>
+
+  <Import Project="dependencies.props" />
+  <Import Project="version.props" />
+
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Product>aspnet-contrib</Product>
+    <PackageIconUrl>https://avatars3.githubusercontent.com/u/7998081?s=64</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/aspnet-contrib/AspNet.Security.OpenIdConnect.Server</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>git://github.com/aspnet-contrib/AspNet.Security.OpenIdConnect.Server</RepositoryUrl>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+
+</Project>
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <PropertyGroup>
+    <AngleSharpVersion>0.9.9</AngleSharpVersion>
+    <AspNetCoreVersion>1.0.0</AspNetCoreVersion>
+    <IdentityModelVersion>1.0.4.402070948</IdentityModelVersion>
+    <IdentityModelCoreVersion>2.0.0</IdentityModelCoreVersion>
+    <JetBrainsVersion>10.3.0</JetBrainsVersion>
+    <JsonNetVersion>9.0.1</JsonNetVersion>
+    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <MoqVersion>4.6.38-alpha</MoqVersion>
+    <OwinVersion>3.0.1</OwinVersion>
+    <RuntimeFrameworkVersion>1.0.0</RuntimeFrameworkVersion>
+    <TestSdkVersion>15.0.0</TestSdkVersion>
+    <XunitVersion>2.2.0</XunitVersion>
+  </PropertyGroup>
+
+</Project>
diff --git a/build/repo.props b/build/repo.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <ItemGroup>
+    <ExcludeFromTest Include="$(RepositoryRoot)test\Owin.Security.OpenIdConnect.Extensions.Tests\*.csproj" Condition="'$(OS)' != 'Windows_NT'"/>
+    <ExcludeFromTest Include="$(RepositoryRoot)test\Owin.Security.OpenIdConnect.Server.Tests\*.csproj" Condition="'$(OS)' != 'Windows_NT'"/>
+  </ItemGroup>
+
+</Project>
diff --git a/build/version.props b/build/version.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <PropertyGroup>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix>rtm</VersionSuffix>
+  </PropertyGroup>
+
+</Project>
diff --git a/global.json b/global.json