Update CoreRT build to use latest .NET CLI and build tools (dotnet#3916)

- Pick up latest .NET Core 2.0 CLI and buildtools
- Remove all project.json references and convert everything to msbuild projects
- Stick to vanilla .NET CLI project shape as much as possible. Minimize dependencies on buildtools special behaviors

BuildToolsVersion.txt

@@ -1 +1 @@
-1.0.27-prerelease-01322-01
+2.0.0-prerelease-01702-02

Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md

@@ -41,15 +41,15 @@ You should now be able to use the `dotnet` commands of the CLI tools.
   </PropertyGroup>
 
   <Import Project="$(MSBuildSDKsPath)\Microsoft.NET.Sdk\Sdk\Sdk.targets" />
-  <Import Project="$(IlcPath)\Microsoft.NETCore.Native.targets" />
+  <Import Project="$(IlcPath)\build\Microsoft.NETCore.Native.targets" />
 </Project>
 ```
 
-* Set IlcPath environment variable to point to the built binaries. Alternatively, pass an extra `/p:IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug\packaging\publish1` argument to all dotnet commands below.
+* Set IlcPath environment variable to point to the built binaries. Alternatively, pass an extra `/p:IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug` argument to all dotnet commands below.
 
-    * Unix: `export IlcPath=<repo_root>/bin/Product/Linux.x64.Debug/packaging/publish1`
+    * Unix: `export IlcPath=<repo_root>/bin/Product/Linux.x64.Debug`
 
-    * Windows: `set IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug\packaging\publish1`
+    * Windows: `set IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug`
 
 * Run `dotnet restore`. This will download nuget packages required for compilation.
 

DotnetCLIVersion.txt

@@ -1 +1 @@
-1.0.0-preview3-003223
+2.0.0-preview1-005977

src/NuGet.config → NuGet.config

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!-- NOTE: Leave this file here and keep it in sync with list in dir.props. -->
-  <!-- The command-line doesn't need it, but the IDE does.                    -->
   <packageSources>
     <clear/>
     <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
     <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="myget.org dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
-    <add key="myget.org dotnet-corert" value="https://dotnet.myget.org/F/dotnet-corert/api/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <config>
-    <add key="repositoryPath" value="..\packages" />
+    <add key="repositoryPath" value="packages" />
   </config>
   <packageRestore>
     <!-- Automated package restore in VS does not work at this time with
          this project and it causes build failures in VS. Disable it. -->
     <add key="automatic" value="false" />
   </packageRestore>
+  <!-- Don't use any higher level config files.
+       Our builds need to be isolated from user/machine state -->
+  <fallbackPackageFolders>
+    <clear />
+  </fallbackPackageFolders>
 </configuration>

build.cmd

@@ -36,6 +36,14 @@ exit /b %ERRORLEVEL%
 
 :AfterNativeBuild
 
+call %~dp0buildscripts\build-restore.cmd %*
+
+IF NOT ERRORLEVEL 1 goto AfterRestoreBuild
+echo Managed component build failed. Refer !__BuildLog! for details.
+exit /b %ERRORLEVEL%
+
+:AfterRestoreBuild
+
 call %~dp0buildscripts\build-managed.cmd %*
 
 IF NOT ERRORLEVEL 1 goto AfterManagedBuild

build.proj

@@ -1,53 +1,22 @@
 <Project DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="dir.props" />
 
-  <!-- The following properties are in place to keep the behavior of build.cmd while we work on the dev workflow steps. -->
+  <!-- required to build the projects in their specified order -->
   <PropertyGroup>
-    <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
-    <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
+    <SerializeProjects>true</SerializeProjects>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <GenerateCodeCoverageReportForAll>true</GenerateCodeCoverageReportForAll>
-  </PropertyGroup>
-  <Import Project="$(ToolsDir)CodeCoverage.targets" Condition="Exists('$(ToolsDir)CodeCoverage.targets')" />
-  <Import Project="$(ToolsDir)PerfTesting.targets" Condition="Exists('$(ToolsDir)PerfTesting.targets') and '$(Performance)' == 'true'"/>
   <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />
 
   <ItemGroup>
+    <Project Include="src\Common\test-runtime\XUnit.Runtime.depproj" />
     <Project Include="src\dirs.proj" />
   </ItemGroup>
 
   <Import Project="dir.targets" />
 
   <Import Project="dir.traversal.targets" />
 
-  <PropertyGroup Condition="'$(RestoreDuringBuild)'=='true'">
-    <TraversalBuildDependsOn>
-      BatchRestorePackages;
-      $(TraversalBuildDependsOn);
-    </TraversalBuildDependsOn>
-  </PropertyGroup>
-
-  <Target Name="BatchRestorePackages">
-    <MakeDir Directories="$(PackagesDir)" Condition="!Exists('$(PackagesDir)')" />
-
-    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." />
-
-    <Exec Command="$(DnuRestoreCommand) @(DnuRestoreDir->'&quot;%(Identity)&quot;', ' ')"
-          StandardOutputImportance="Low"
-          CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)"
-          ContinueOnError="ErrorAndContinue" />
-
-    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." />
-  </Target>
-
-  <!-- Override RestorePackages from dir.traversal.targets and do a batch restore -->
-  <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" />
-
-  <!-- Override clean from dir.traversal.targets and just remove the full BinDir unless build.[cmd|sh] has already done the cleaning -->
-  <Target Name="Clean">
-    <RemoveDir Condition="'$(CleanedTheBuild)' != '1'" Directories="$(ObjDir)" />
-  </Target>
+  <Import Project="$(ToolsDir)clean.targets" />
 
 </Project>

buildscripts/build-managed.cmd

@@ -30,9 +30,6 @@ exit /b %ERRORLEVEL%
 rem Explicitly set Platform causes conflicts in managed project files. Clear it to allow building from VS x64 Native Tools Command Prompt
 set Platform=
 
-:: Restore the Tools directory
-call  "%__ProjectDir%\init-tools.cmd"
-
 rem Tell nuget to always use repo-local nuget package cache. The "dotnet restore" invocations use the --packages
 rem argument, but there are a few commands in publish and tests that do not.
 set "NUGET_PACKAGES=%__PackagesDir%"
@@ -45,7 +42,7 @@ dir /b "%__DotNetCliPath%\sdk"
 call "!VS%__VSProductVersion%COMNTOOLS!\VsDevCmd.bat"
 echo Commencing build of managed components for %__BuildOS%.%__BuildArch%.%__BuildType%
 echo.
-%_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "%__ProjectDir%\build.proj" %__MSBCleanBuildArgs% %__ExtraMsBuildParams% /p:RepoPath="%__ProjectDir%" /p:RepoLocalBuild="true" /p:RelativeProductBinDir="%__RelativeProductBinDir%" /p:NuPkgRid=win7-x64 /p:ToolchainMilestone=%__ToolchainMilestone% /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%"
+%_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "%__ProjectDir%\build.proj" %__MSBCleanBuildArgs% %__ExtraMsBuildParams% /p:RepoPath="%__ProjectDir%" /p:RepoLocalBuild="true" /p:NuPkgRid=win7-x64 /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%"
 IF NOT ERRORLEVEL 1 (
   findstr /ir /c:".*Warning(s)" /c:".*Error(s)" /c:"Time Elapsed.*" "%__BuildLog%"
   goto AfterILCompilerBuild
@@ -61,21 +58,15 @@ set __GenRespFiles=0
 if not exist "%__ObjDir%\ryujit.rsp" set __GenRespFiles=1
 if not exist "%__ObjDir%\cpp.rsp" set __GenRespFiles=1
 if "%__GenRespFiles%"=="1" (
-    if exist "%__ReproProjectBinDir%" rd /s /q "%__ReproProjectBinDir%"
-    if exist "%__ReproProjectObjDir%" rd /s /q "%__ReproProjectObjDir%"
-
-    %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%\packaging\publish1" /p:Configuration=%__BuildType% /t:IlcCompile "%__ReproProjectDir%\repro.csproj"
-    call :CopyResponseFile "%__ReproProjectObjDir%\native\repro.ilc.rsp" "%__ObjDir%\ryujit.rsp"
-
-    if exist "%__ReproProjectBinDir%" rd /s /q "%__ReproProjectBinDir%"
-    if exist "%__ReproProjectObjDir%" rd /s /q "%__ReproProjectObjDir%"
+    %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%" /p:Configuration=%__BuildType% /t:Clean,IlcCompile "%__ProjectDir%\src\ILCompiler\repro\repro.csproj"
+    call :CopyResponseFile "%__ObjDir%\repro\native\repro.ilc.rsp" "%__ObjDir%\ryujit.rsp"
 
     set __ExtraArgs=/p:NativeCodeGen=cpp
     if /i "%__BuildType%"=="debug" (
         set __ExtraArgs=!__ExtraArgs! "/p:AdditionalCppCompilerFlags=/MTd"
     )
-    %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%\packaging\publish1" /p:Configuration=%__BuildType% /t:IlcCompile "%__ReproProjectDir%\repro.csproj" !__ExtraArgs!
-    call :CopyResponseFile "%__ReproProjectObjDir%\native\repro.ilc.rsp" "%__ObjDir%\cpp.rsp"
+    %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%" /p:Configuration=%__BuildType% /t:Clean,IlcCompile "%__ProjectDir%\src\ILCompiler\repro\repro.csproj" !__ExtraArgs!
+    call :CopyResponseFile "%__ObjDir%\repro\native\repro.ilc.rsp" "%__ObjDir%\cpp.rsp"
 )
 :AfterVsDevGenerateRespFiles
 exit /b %ERRORLEVEL%
@@ -108,4 +99,4 @@ rem %1 Full path to the file, %2 Variable to receive the file name
 setlocal
 for %%i in ("%1") DO set fileName=%%~ni
 endlocal & set "%2=%fileName%"
-goto:eof
+goto:eof

buildscripts/build-managed.sh

@@ -26,17 +26,39 @@ build_managed_corert()
     __buildproj=$__ProjectRoot/build.proj
     __buildlog=$__ProjectRoot/msbuild.$__BuildArch.log
 
-    if [ -z "${ToolchainMilestone}" ]; then
-        ToolchainMilestone=testing
-    fi
-
     __buildarch="$__BuildArch"
     if [ "$__buildarch" = "armel" ]; then
         __buildarch=arm
         __ExtraMsBuildArgs="$__ExtraMsBuildArgs /p:BinDirPlatform=armel"
     fi
 
-    $__ProjectRoot/Tools/msbuild.sh "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:RelativeProductBinDir=$__RelativeProductBinDir /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:TestNugetRuntimeId=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:ToolchainMilestone=${ToolchainMilestone} $__UnprocessedBuildArgs $__ExtraMsBuildArgs
+    $__dotnetclipath/dotnet msbuild "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Restore /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) $__UnprocessedBuildArgs $__ExtraMsBuildArgs
+    export BUILDERRORLEVEL=$?
+
+    echo
+
+    # Pull the build summary from the log file
+    tail -n 4 "$__buildlog"
+    echo Build Exit Code = $BUILDERRORLEVEL
+    if [ $BUILDERRORLEVEL != 0 ]; then
+        exit $BUILDERRORLEVEL
+    fi
+
+    # Buildtools tooling is not capable of publishing netcoreapp currently. Use helper projects to publish skeleton of
+    # the standalone app that the build injects actual binaries into later.
+    $__dotnetclipath/dotnet restore $__sourceroot/ILCompiler/netcoreapp/ilc.csproj -r $__NugetRuntimeId
+    export BUILDERRORLEVEL=$?
+    if [ $BUILDERRORLEVEL != 0 ]; then
+        exit $BUILDERRORLEVEL
+    fi
+    $__dotnetclipath/dotnet publish $__sourceroot/ILCompiler/netcoreapp/ilc.csproj -r $__NugetRuntimeId -o $__ProductBinDir/tools
+    export BUILDERRORLEVEL=$?
+    if [ $BUILDERRORLEVEL != 0 ]; then
+        exit $BUILDERRORLEVEL
+    fi
+    chmod +x $__ProductBinDir/tools/ilc
+
+    $__ProjectRoot/Tools/msbuild.sh "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) $__UnprocessedBuildArgs $__ExtraMsBuildArgs
     export BUILDERRORLEVEL=$?
 
     echo
@@ -87,7 +109,7 @@ get_official_cross_builds()
                 exit $BUILDERRORLEVEL
             fi
             tar xvf ./build.tar.gz ./System.Native.a
-            mv ./System.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/packaging/publish1/framework
+            mv ./System.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/framework
             rm -rf ./build.tar.gz
         fi
         if [ -n ${__coreclrsource} ]; then
@@ -96,7 +118,7 @@ get_official_cross_builds()
             if [ $BUILDERRORLEVEL != 0 ]; then
                 exit $BUILDERRORLEVEL
             fi
-            mv ./libSystem.Globalization.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/packaging/publish1/framework
+            mv ./libSystem.Globalization.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/framework
         fi
      fi
 }

buildscripts/build-native.sh

@@ -119,7 +119,6 @@ build_host_native_corert()
     build_native_corert
 
     cp ${__ProductHostBinDir}/jitinterface.so ${__ProductBinDir}
-    cp ${__ProductHostBinDir}/jitinterface.so ${__ProductBinDir}/packaging/publish1
 
     export __BuildArch=$__SavedBuildArch
     export __IntermediatesDir=$__SavedIntermediatesDir

buildscripts/build-restore.cmd

@@ -0,0 +1,46 @@
+@if not defined _echo @echo off
+setlocal EnableDelayedExpansion
+
+set __ThisScriptShort=%0
+
+if /i "%1" == "/?"    goto HelpVarCall
+if /i "%1" == "-?"    goto HelpVarCall
+if /i "%1" == "/h"    goto HelpVarCall
+if /i "%1" == "-h"    goto HelpVarCall
+if /i "%1" == "/help" goto HelpVarCall
+if /i "%1" == "-help" goto HelpVarCall
+
+if defined BUILDVARS_DONE goto :AfterVarSetup
+
+goto :NormalVarCall
+
+:HelpVarCall
+call %~dp0buildvars-setup.cmd -help
+exit /b 1
+
+:NormalVarCall
+call %~dp0buildvars-setup.cmd %*
+
+IF NOT ERRORLEVEL 1 goto AfterVarSetup
+echo Setting build variables failed.
+exit /b %ERRORLEVEL%
+
+:AfterVarSetup
+
+:: Restore the Tools directory
+call  "%__ProjectDir%\init-tools.cmd"
+
+"%__DotNetCliPath%\dotnet.exe" msbuild "%__ProjectDir%\build.proj" /nologo /t:Restore /flp:v=normal;LogFile=build-restore.log /p:NuPkgRid=win7-x64 /maxcpucount /p:OSGroup=%__BuildOS% /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__ExtraMsBuildParams%
+IF ERRORLEVEL 1 goto ErrorExit
+
+rem Buildtools tooling is not capable of publishing netcoreapp currently. Use helper projects to publish skeleton of
+rem the standalone app that the build injects actual binaries into later.
+"%__DotNetCliPath%\dotnet.exe" restore "%__SourceDir%\ILCompiler\netcoreapp\ilc.csproj" -r win7-x64
+IF ERRORLEVEL 1 goto ErrorExit
+"%__DotNetCliPath%\dotnet.exe" publish "%__SourceDir%\ILCompiler\netcoreapp\ilc.csproj" -r win7-x64 -o "%__RootBinDir%\%__BuildOS%.%__BuildArch%.%__BuildType%\tools"
+IF ERRORLEVEL 1 goto ErrorExit
+
+exit /b 0
+
+:ErrorExit
+exit /b 1

buildscripts/buildvars-setup.cmd

@@ -17,7 +17,6 @@ set "__RootBinDir=%__ProjectDir%\bin"
 set "__LogsDir=%__RootBinDir%\Logs"
 set __MSBCleanBuildArgs=
 set __SkipTestBuild=
-set __ToolchainMilestone=testing
 set "__DotNetCliPath=%__ProjectDir%\Tools\dotnetcli"
 
 :Arg_Loop
@@ -44,7 +43,6 @@ if /i "%1" == "clean"   (set __CleanBuild=1&shift&goto Arg_Loop)
 
 if /i "%1" == "skiptests" (set __SkipTests=1&shift&goto Arg_Loop)
 if /i "%1" == "skipvsdev" (set __SkipVsDev=1&shift&goto Arg_Loop)
-if /i "%1" == "/milestone" (set __ToolchainMilestone=%2&shift&shift&goto Arg_Loop)
 if /i "%1" == "/dotnetclipath" (set __DotNetCliPath=%2&shift&shift&goto Arg_Loop)
 
 if /i "%1" == "/officialbuildid" (set "__ExtraMsBuildParams=/p:OfficialBuildId=%2"&shift&shift&goto Arg_Loop)
@@ -54,15 +52,11 @@ exit /b 1
 :ArgsDone
 
 :: Set the remaining variables based upon the determined build configuration
-set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%"
+set "__BinDir=%__RootBinDir%\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__ObjDir=%__RootBinDir%\obj\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__IntermediatesDir=%__RootBinDir%\obj\Native\%__BuildOS%.%__BuildArch%.%__BuildType%\"
-set "__RelativeProductBinDir=bin\Product\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__NativeBuildLog=%__LogsDir%\Native_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
 set "__BuildLog=%__LogsDir%\msbuild_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__ReproProjectDir=%__ProjectDir%\src\ILCompiler\repro"
-set "__ReproProjectBinDir=%__BinDir%\repro"
-set "__ReproProjectObjDir=%__ObjDir%\repro"
 
 :: Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash
 set "__CMakeBinDir=%__BinDir%"
@@ -174,4 +168,4 @@ echo Build type: one of Debug, Checked, Release ^(default: Debug^).
 echo Visual Studio version: vs2015, vs2017 ^(defaults to highest detected^).
 echo clean: force a clean build ^(default is to perform an incremental build^).
 echo skiptests: skip building tests ^(default: tests are built^).
-exit /b 1
+exit /b 1

buildscripts/buildvars-setup.sh

@@ -251,11 +251,10 @@ export __IntermediatesDir="$__rootbinpath/obj/Native/$__BuildOS.$__BuildArch.$__
 if [ $__CrossBuild = 1 ]; then
     export __IntermediatesHostDir="$__rootbinpath/obj/Native/$__BuildOS.$__HostArch.$__BuildType"
 fi
-export __ProductBinDir="$__rootbinpath/Product/$__BuildOS.$__BuildArch.$__BuildType"
+export __ProductBinDir="$__rootbinpath/$__BuildOS.$__BuildArch.$__BuildType"
 if [ $__CrossBuild = 1 ]; then
-    export __ProductHostBinDir="$__rootbinpath/Product/$__BuildOS.$__HostArch.$__BuildType"
+    export __ProductHostBinDir="$__rootbinpath/$__BuildOS.$__HostArch.$__BuildType"
 fi
-export __RelativeProductBinDir="bin/Product/$__BuildOS.$__BuildArch.$__BuildType"
 
 # CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set.
 # This is needed by CLI to function.

dependencies.props

@@ -0,0 +1,10 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RyuJITVersion>2.1.0-preview1-25412-03</RyuJITVersion>
+    <ObjectWriterVersion>1.0.19-prerelease-00001</ObjectWriterVersion>
+    <CoreFXVersion>4.5.0-preview1-25417-02</CoreFXVersion>
+    <MicrosoftNETCoreNativeVersion>2.0.0-beta-25021-03</MicrosoftNETCoreNativeVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.0.0-preview2-25312-01</MicrosoftNETCoreAppPackageVersion>
+    <XunitNetcoreExtensionsVersion>1.0.1-prerelease-01616-05</XunitNetcoreExtensionsVersion>
+  </PropertyGroup>
+</Project>